diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 9 | ||||
| -rw-r--r-- | tools/h5toh4.c | 1 | ||||
| -rw-r--r-- | tools/h5tools.c | 2 | ||||
| -rwxr-xr-x | tools/testh5dump.sh | 15 |
4 files changed, 20 insertions, 7 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 28ea50b..daed201 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -4,16 +4,19 @@ # All rights reserved. # # -@COMMENCE@ top_srcdir=@top_srcdir@ +top_builddir=.. +srcdir=@srcdir@ +VPATH=.:@srcdir@ +@COMMENCE@ # Add include directory to the C preprocessor flags, add -lh5tools and # -lhdf5 to the list of libraries. -CPPFLAGS=-I../src -I. @CPPFLAGS@ +CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@ # Test programs and scripts. TEST_PROGS= -TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@ +TEST_SCRIPTS=$(srcdir)/testh5dump.sh @TESTH5TOH4@ # These are our main targets: library and tools. We link this library # statically because some systems can only link executables to a single diff --git a/tools/h5toh4.c b/tools/h5toh4.c index 1568e5b..34cc1c8 100644 --- a/tools/h5toh4.c +++ b/tools/h5toh4.c @@ -78,6 +78,7 @@ main(int argc, char **argv) int status = 0; int status2 = 0; + optind = 1; fargv = argv + optind; argc -= optind; diff --git a/tools/h5tools.c b/tools/h5tools.c index d69a280..1067494 100644 --- a/tools/h5tools.c +++ b/tools/h5tools.c @@ -111,7 +111,9 @@ static void h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp) { size_t i, n, offset, size, dims[H5S_MAX_RANK], nelmts; +#ifndef NDEBUG unsigned overflow = 0xaaaaaaaa; +#endif char temp[8192]; char *name, quote='\0'; hid_t memb; diff --git a/tools/testh5dump.sh b/tools/testh5dump.sh index b33987c..c8026cd 100755 --- a/tools/testh5dump.sh +++ b/tools/testh5dump.sh @@ -7,6 +7,12 @@ diff='diff -c' nerrors=0 verbose=yes +# The build (current) directory might be different than the source directory. +if test "X$srcdir" = X; then + srcdir=. +fi +mkdir testfiles >/dev/null 2>&1 + # Print a line-line message left justified in a field of 70 characters # beginning with the word "Testing". TESTING() @@ -27,6 +33,7 @@ DUMP() expect=testfiles/$1 actual="testfiles/`basename $1 .ddl`.out" shift + full=`pwd`/$h5dump # Run test. TESTING $h5dump $@ @@ -34,8 +41,8 @@ DUMP() echo "#############################" echo "Expected output for '$h5dump $@'" echo "#############################" - cd testfiles - ../$h5dump "$@" 2>/dev/null + cd $srcdir/testfiles + $full "$@" 2>/dev/null ) >$actual # Results. We normalize the result to account for different output @@ -43,7 +50,7 @@ DUMP() # differences are in white space. We have to do this the hard way # because diff isn't always smart enough. tr '\n' ' ' <$actual |tr -s ' \t' |fold >$actual-norm - tr '\n' ' ' <$expect |tr -s ' \t' |fold >$expect-norm + tr '\n' ' ' <$srcdir/$expect |tr -s ' \t' |fold >$expect-norm if $cmp $expect-norm $actual-norm; then echo " PASSED" @@ -51,7 +58,7 @@ DUMP() echo "*FAILED*" echo " Actual result (*.out) differs from expected result (*.ddl)" nerrors="`expr $nerrors + 1`" - test yes = "$verbose" && $diff $expect $actual |sed 's/^/ /' + test yes = "$verbose" && $diff $srcdir/$expect $actual |sed 's/^/ /' fi # Clean up output file |