diff options
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | configure.in | 34 | ||||
| -rwxr-xr-x | tools/h5dump/testh5dump.sh | 210 |
4 files changed, 38 insertions, 227 deletions
@@ -1133,7 +1133,7 @@ ./tools/h5dump/h5dump.c ./tools/h5dump/h5dump.h ./tools/h5dump/h5dumpgentest.c -./tools/h5dump/testh5dump.sh +./tools/h5dump/testh5dump.sh.in ./tools/h5dump/testh5dumpxml.sh ./tools/h5import/Dependencies @@ -23012,6 +23012,7 @@ echo "$as_me: error: couldn't find dmalloc library" >&2;} ;; esac + USE_FILTER_DEFLATE="no" # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -23587,6 +23588,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_FILTER_DEFLATE 1 _ACEOF + USE_FILTER_DEFLATE="yes" if test "X$EXTERNAL_FILTERS" != "X"; then EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," @@ -23595,6 +23597,7 @@ _ACEOF fi + USE_FILTER_SZIP="no" # Check whether --with-szlib or --without-szlib was given. if test "${with_szlib+set}" = set; then @@ -24034,6 +24037,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_FILTER_SZIP 1 _ACEOF + USE_FILTER_SZIP="yes" if test "X$EXTERNAL_FILTERS" != "X"; then EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," @@ -31738,6 +31742,9 @@ echo "${ECHO_T}no" >&6 fi + + USE_FILTER_SHUFFLE="no" + USE_FILTER_FLETCHER32="no" echo "$as_me:$LINENO: checking for I/O filters" >&5 echo $ECHO_N "checking for I/O filters... $ECHO_C" >&6 # Check whether --enable-filters or --disable-filters was given. @@ -31746,7 +31753,6 @@ if test "${enable_filters+set}" = set; then FILTERS=$enableval fi; - all_filters="shuffle,fletcher32" case "X-$FILTERS" in X-|X-all) @@ -31767,12 +31773,13 @@ esac if test -n "$FILTERS"; then for filter in `echo $FILTERS | tr 'a-z,' 'A-Z '`; do - if test $filter = "SHUFFLE"; then + if test $filter = "SHUFFLE"; then cat >>confdefs.h <<\_ACEOF #define HAVE_FILTER_SHUFFLE 1 _ACEOF + USE_FILTER_SHUFFLE="yes" fi if test $filter = "FLETCHER32"; then @@ -31780,6 +31787,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_FILTER_FLETCHER32 1 _ACEOF + USE_FILTER_FLETCHER32="yes" fi done fi @@ -31955,7 +31963,7 @@ if test "$HAVE_PABLO" = "yes"; then fi fi -ac_config_files="$ac_config_files src/libhdf5.settings config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/Makefile $PABLO_MAKE test/Makefile $PARALLEL_MAKE perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5import/Makefile tools/h5diff/Makefile tools/h5repack/Makefile tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/gifconv/Makefile examples/Makefile doc/Makefile doc/html/Makefile doc/html/ed_libs/Makefile doc/html/ed_styles/Makefile doc/html/ADGuide/Makefile doc/html/Graphics/Makefile doc/html/Intro/Makefile doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/cpplus/Makefile doc/html/fortran/Makefile" +ac_config_files="$ac_config_files src/libhdf5.settings config/depend1 config/depend2 config/depend3 config/depend4 config/dependN config/commence config/conclude Makefile src/Makefile $PABLO_MAKE test/Makefile $PARALLEL_MAKE perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5repack/Makefile tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/gifconv/Makefile examples/Makefile doc/Makefile doc/html/Makefile doc/html/ed_libs/Makefile doc/html/ed_styles/Makefile doc/html/ADGuide/Makefile doc/html/Graphics/Makefile doc/html/Intro/Makefile doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/cpplus/Makefile doc/html/fortran/Makefile" cat >confcache <<\_ACEOF @@ -32455,6 +32463,7 @@ do "perform/Makefile" ) CONFIG_FILES="$CONFIG_FILES perform/Makefile" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "tools/h5dump/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/h5dump/Makefile" ;; + "tools/h5dump/testh5dump.sh" ) CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dump.sh" ;; "tools/h5import/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/h5import/Makefile" ;; "tools/h5diff/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/h5diff/Makefile" ;; "tools/h5repack/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/h5repack/Makefile" ;; @@ -32597,6 +32606,8 @@ s,@CPP@,$CPP,;t t s,@LIBTOOL@,$LIBTOOL,;t t /@DEPEND@/r $DEPEND s,@DEPEND@,,;t t +s,@USE_FILTER_DEFLATE@,$USE_FILTER_DEFLATE,;t t +s,@USE_FILTER_SZIP@,$USE_FILTER_SZIP,;t t s,@PABLO@,$PABLO,;t t s,@HAVE_PABLO@,$HAVE_PABLO,;t t s,@SSL@,$SSL,;t t @@ -32614,6 +32625,8 @@ s,@RUNPARALLEL@,$RUNPARALLEL,;t t s,@TESTPARALLEL@,$TESTPARALLEL,;t t s,@MPE@,$MPE,;t t s,@FILTERS@,$FILTERS,;t t +s,@USE_FILTER_SHUFFLE@,$USE_FILTER_SHUFFLE,;t t +s,@USE_FILTER_FLETCHER32@,$USE_FILTER_FLETCHER32,;t t s,@H5_VERSION@,$H5_VERSION,;t t s,@CONFIG_DATE@,$CONFIG_DATE,;t t s,@CONFIG_USER@,$CONFIG_USER,;t t diff --git a/configure.in b/configure.in index 82a52d9..e4edd20 100644 --- a/configure.in +++ b/configure.in @@ -802,6 +802,7 @@ dnl `-lz' and their locations might be specified with the `--with-zlib' dnl command-line switch. The value is an include path and/or a library path. dnl If the library path is specified then it must be preceded by a comma. dnl +AC_SUBST(USE_FILTER_DEFLATE) USE_FILTER_DEFLATE="no" AC_ARG_WITH([zlib], [AC_HELP_STRING([--with-zlib=DIR], [Use zlib library for external deflate I/O @@ -874,8 +875,8 @@ case $withval in esac if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes" -a "x$HAVE_COMPRESS2" = "xyes"; then - AC_DEFINE(HAVE_FILTER_DEFLATE, 1, - [Define if support for deflate filter is enabled]) + AC_DEFINE([HAVE_FILTER_DEFLATE], [1], [Define if support for deflate filter is enabled]) + USE_FILTER_DEFLATE="yes" dnl Add "deflate" to external filter list if test "X$EXTERNAL_FILTERS" != "X"; then @@ -891,6 +892,7 @@ dnl `-lsz' and their locations might be specified with the `--with-szlib' dnl command-line switch. The value is an include path and/or a library path. dnl If the library path is specified then it must be preceded by a comma. dnl +AC_SUBST(USE_FILTER_SZIP) USE_FILTER_SZIP="no" AC_ARG_WITH([szlib], [AC_HELP_STRING([--with-szlib=DIR], [Use szlib library for external szlib I/O @@ -963,6 +965,7 @@ esac if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then AC_DEFINE(HAVE_FILTER_SZIP, 1, [Define if support for szip filter is enabled]) + USE_FILTER_SZIP="yes" dnl Add "szip" to external filter list if test "X$EXTERNAL_FILTERS" != "X"; then @@ -2060,7 +2063,10 @@ dnl an example of an internal filter, while the gzip filter is an example of dnl an external filter. Each external filter is controlled with an dnl "--with-foo=" configure flag. dnl -AC_MSG_CHECKING(for I/O filters) +AC_SUBST([FILTERS]) +AC_SUBST(USE_FILTER_SHUFFLE) USE_FILTER_SHUFFLE="no" +AC_SUBST(USE_FILTER_FLETCHER32) USE_FILTER_FLETCHER32="no" +AC_MSG_CHECKING([for I/O filters]) AC_ARG_ENABLE([filters], [AC_HELP_STRING([--enable-filters=all], [Turn on all internal I/O filters. One may @@ -2069,36 +2075,37 @@ AC_ARG_ENABLE([filters], I/O filters.])], [FILTERS=$enableval]) -AC_SUBST([FILTERS]) dnl Eventually: all_filters="shuffle,foo,bar,baz" all_filters="shuffle,fletcher32" case "X-$FILTERS" in X-|X-all) FILTERS=$all_filters - AC_MSG_RESULT(all ($FILTERS)) + AC_MSG_RESULT([all ($FILTERS)]) ;; X-no|X-none) - AC_MSG_RESULT(none) + AC_MSG_RESULT([none]) FILTERS="none" ;; *) - AC_MSG_RESULT($FILTERS) + AC_MSG_RESULT([$FILTERS]) ;; esac if test -n "$FILTERS"; then for filter in `echo $FILTERS | tr 'a-z,' 'A-Z '`; do -dnl ---------------------------------------------------------------------- -dnl Have to use separate 'if' construct for each filter, so that autoheader -dnl can detect the AC_DEFINE for each one... -dnl + dnl ------------------------------------------------------------------ + dnl Have to use separate 'if' construct for each filter, so that + dnl autoheader can detect the AC_DEFINE for each one... + dnl if test $filter = "SHUFFLE"; then - AC_DEFINE(HAVE_FILTER_SHUFFLE, 1, + AC_DEFINE([HAVE_FILTER_SHUFFLE], [1], [Define if support for shuffle filter is enabled]) + USE_FILTER_SHUFFLE="yes" fi if test $filter = "FLETCHER32"; then - AC_DEFINE(HAVE_FILTER_FLETCHER32, 1, + AC_DEFINE([HAVE_FILTER_FLETCHER32], [1], [Define if support for Fletcher32 checksum is enabled]) + USE_FILTER_FLETCHER32="yes" fi done fi @@ -2333,6 +2340,7 @@ AC_CONFIG_FILES([src/libhdf5.settings perform/Makefile tools/Makefile tools/h5dump/Makefile + tools/h5dump/testh5dump.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5repack/Makefile diff --git a/tools/h5dump/testh5dump.sh b/tools/h5dump/testh5dump.sh deleted file mode 100755 index fc63188..0000000 --- a/tools/h5dump/testh5dump.sh +++ /dev/null @@ -1,210 +0,0 @@ -#! /bin/sh -# -# Copyright by the Board of Trustees of the University of Illinois. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the files COPYING and Copyright.html. COPYING can be found at the root -# of the source code distribution tree; Copyright.html can be found at the -# root level of an installed copy of the electronic HDF5 document set and -# is linked from the top-level documents page. It can also be found at -# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. -# -# Tests for the h5dump tool - -DUMPER=h5dump # The tool name -DUMPER_BIN=`pwd`/$DUMPER # The path of the tool binary - -CMP='cmp -s' -DIFF='diff -c' - -nerrors=0 -verbose=yes - -# The build (current) directory might be different than the source directory. -if test -z "$srcdir"; then - srcdir=. -fi - -test -d ../testfiles || mkdir ../testfiles - -# Print a line-line message left justified in a field of 70 characters -# beginning with the word "Testing". -# -TESTING() { - SPACES=" " - echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012' -} - -# Run a test and print PASS or *FAIL*. If a test fails then increment -# the `nerrors' global variable and (if $verbose is set) display the -# difference between the actual output and the expected output. The -# expected output is given as the first argument to this function and -# the actual output file is calculated by replacing the `.ddl' with -# `.out'. The actual output is not removed if $HDF5_NOCLEANUP has a -# non-zero value. -# -TOOLTEST() { - expect="$srcdir/../testfiles/$1" - actual="../testfiles/`basename $1 .ddl`.out" - actual_err="../testfiles/`basename $1 .ddl`.err" - shift - - # Run test. - TESTING $DUMPER $@ - ( - echo "#############################" - echo "Expected output for '$DUMPER $@'" - echo "#############################" - cd $srcdir/../testfiles - $RUNSERIAL $DUMPER_BIN $@ - ) >$actual 2>$actual_err - cat $actual_err >> $actual - - - if [ ! -f $expect ]; then - # Create the expect file if it doesn't yet exist. - echo " CREATED" - cp $actual $expect - elif $CMP $expect $actual; then - echo " PASSED" - else - echo "*FAILED*" - echo " Expected result (*.ddl) differs from actual result (*.out)" - nerrors="`expr $nerrors + 1`" - test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /' - fi - - # Clean up output file - if test -z "$HDF5_NOCLEANUP"; then - rm -f $actual $actual_err - fi -} - -############################################################################## -############################################################################## -### T H E T E S T S ### -############################################################################## -############################################################################## - -# test for displaying groups -TOOLTEST tgroup-1.ddl tgroup.h5 -# test for displaying the selected groups -TOOLTEST tgroup-2.ddl --group=/g2 --group / -g /y tgroup.h5 - -# test for displaying simple space datasets -TOOLTEST tdset-1.ddl tdset.h5 -# test for displaying selected datasets -TOOLTEST tdset-2.ddl -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5 - -# test for displaying attributes -TOOLTEST tattr-1.ddl tattr.h5 -# test for displaying the selected attributes of string type and scalar space -TOOLTEST tattr-2.ddl -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5 -# test for header and error messages -TOOLTEST tattr-3.ddl --header -a /attr2 --attribute=/attr tattr.h5 -# test for displaying shared datatype in attribute -TOOLTEST tnamed_dtype_attr.ddl -A tnamed_dtype_attr.h5 - -# test for displaying soft links -TOOLTEST tslink-1.ddl tslink.h5 -# test for displaying the selected link -TOOLTEST tslink-2.ddl -l slink2 tslink.h5 - -# tests for hard links -TOOLTEST thlink-1.ddl thlink.h5 -TOOLTEST thlink-2.ddl -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 thlink.h5 -TOOLTEST thlink-3.ddl -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 thlink.h5 -TOOLTEST thlink-4.ddl -g /g1 thlink.h5 -TOOLTEST thlink-5.ddl -d /dset1 -g /g2 -d /g1/dset2 thlink.h5 - -# tests for compound data types -TOOLTEST tcomp-1.ddl tcompound.h5 -# test for named data types -TOOLTEST tcomp-2.ddl -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5 -# test for unamed type -TOOLTEST tcomp-3.ddl -t /#6632:0 -g /group2 tcompound.h5 -# test complicated compound datatype -TOOLTEST tcomp-4.ddl tcompound_complex.h5 - -#test for the nested compound type -TOOLTEST tnestcomp-1.ddl tnestedcomp.h5 - -# test for options -TOOLTEST tall-1.ddl tall.h5 -TOOLTEST tall-2.ddl --header -g /g1/g1.1 -a attr2 tall.h5 -TOOLTEST tall-3.ddl -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5 - -# test for loop detection -TOOLTEST tloop-1.ddl tloop.h5 - -# test for string -TOOLTEST tstr-1.ddl tstr.h5 -TOOLTEST tstr-2.ddl tstr2.h5 - -# test for file created by Lib SAF team -TOOLTEST tsaf.ddl tsaf.h5 - -# test for file with variable length data -TOOLTEST tvldtypes1.ddl tvldtypes1.h5 -TOOLTEST tvldtypes2.ddl tvldtypes2.h5 -TOOLTEST tvldtypes3.ddl tvldtypes3.h5 -TOOLTEST tvldtypes4.ddl tvldtypes4.h5 -TOOLTEST tvldtypes5.ddl tvldtypes5.h5 - -#test for file with variable length string data -TOOLTEST tvlstr.ddl tvlstr.h5 - -# test for files with array data -TOOLTEST tarray1.ddl tarray1.h5 -TOOLTEST tarray2.ddl tarray2.h5 -TOOLTEST tarray3.ddl tarray3.h5 -TOOLTEST tarray4.ddl tarray4.h5 -TOOLTEST tarray5.ddl tarray5.h5 -TOOLTEST tarray6.ddl tarray6.h5 -TOOLTEST tarray7.ddl tarray7.h5 - -# test for files with empty data -TOOLTEST tempty.ddl tempty.h5 - -# test for files with groups that have comments -TOOLTEST tgrp_comments.ddl tgrp_comments.h5 - -# test the --filedriver flag -TOOLTEST tsplit_file.ddl --filedriver=split tsplit_file -TOOLTEST tfamily.ddl --filedriver=family tfamily%05d.h5 -TOOLTEST tmulti.ddl --filedriver=multi tmulti - -# test for files with group names which reach > 1024 bytes in size -TOOLTEST tlarge_objname.ddl -w157 tlarge_objname.h5 - -# test '-A' to suppress data but print attr's -TOOLTEST tall-2A.ddl -A tall.h5 - -# test Subsetting -TOOLTEST tall-4s.ddl --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5 -TOOLTEST tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5 -TOOLTEST tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5 -TOOLTEST tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5 - -# test printing characters in ASCII instead of decimal -TOOLTEST tchar1.ddl -r tchar.h5 - -# test failure handling -# Missing file name -TOOLTEST tnofilename.ddl - -# test for super block -TOOLTEST tboot.ddl -H -B -d compact tfilters.h5 - -# test for file contents -TOOLTEST tcontents.ddl -n tfilters.h5 - - -if test $nerrors -eq 0 ; then - echo "All $DUMPER tests passed." -fi - -exit $nerrors |