summaryrefslogtreecommitdiffstats
path: root/tools/testh5dump.sh
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-12-17 19:35:20 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-12-17 19:35:20 (GMT)
commit09aaf83332da95084928082e0a8b834460c47dbf (patch)
treef3bd1b2226ca05da937992bd627897d285451902 /tools/testh5dump.sh
parentc26c6a4b25920bda133c93b10b87afedcfa81cdb (diff)
downloadhdf5-09aaf83332da95084928082e0a8b834460c47dbf.zip
hdf5-09aaf83332da95084928082e0a8b834460c47dbf.tar.gz
hdf5-09aaf83332da95084928082e0a8b834460c47dbf.tar.bz2
[svn-r971] Changes since 19981214
---------------------- ./INSTALL Added warning that enabling debugging code can adversely affect performance even when the debugging isn't turned on at run-time. Performance testing shows that under certain circumstances (like data type conversions of compound types) the H5_timer functions, although only a few lines each, contribute a fairly large percent to the execution time. ./src/H5T.c ./src/H5Tpkg.h ./src/H5Tpublic.h Improved the H5Tunregister() function to make unregistering more flexible. It takes the same arguments as H5Tregister() but also accepts wild cards. All conversion functions that match the H5Tunregister() search criteria are removed from the global type conversion table. The H5Tregister_hard() and H5Tregister_soft() were combined into a single function called H5Tregister() which is the counterpart to H5Tunregister(). A new `persistence' argument was added to differentiate between the two types of conversion functions. The application is allowed to register a hard conversion function for the no-op conversion path although the library isn't obligated to call it (it usually does). This is mostly for completeness, but the application might use it to help determine if the raw data pipeline was able to use the optimized path for the case when no type conversion is necessary. The library doesn't allow this path to be unregistered although the application can redefine it as often as it likes. Fixed the type conversion tables in preparation for MT-safety and to fix previosly-known design bugs wrt. unregistering conversion functions or changing the C function associated with a conversion path. The MT-safety stuff is documented in a separate white paper. Increased the conversion function debugging name from 9 characters to 31 characters so the output can be more descriptive. Moved conversion path statistics from the H5T_cdata_t member into the conversion path itself. This makes H5T_cdata_t contain only application-visible data structures. ./src/H5A.c ./src/H5D.c ./src/H5Ofill.c ./src/H5P.c ./src/H5T.c Improved the way type conversion functions are called so the caller doesn't have to check for data type debugging and increment type conversion timers and statistics. Changed check for no-op conversion since it is now application-definable and there may even be more than one definition at a time in a multi-threaded application (one thread might be using the no-op conversion path when some other thread changes its definition -- the first thread still sees the original defintion until it's done with the operation). ./doc/html/Datatypes.html Updated the user guide to reflect the changes to data type conversion registration functions. ./bin/trace ./src/H5.c Added tracing support for the new H5T_pers_t data type. ./test/dtypes.c Added printf to display alignment value if non-aligned data types are being tested. ./test/h5test.c Modified the H5Tunregister() calls to use the new arguments. All 94 of those calls can be replaced by a single call to the new H5Tunregister() function. ./src/H5.c Added HAVE_GETTIMEOFDAY around an auto variable and initialized the elapsed time to zero when gettimeofday() is not available. ./src/H5F.c ./src/H5Fprivate.h ./src/H5P.c Added an H5*_init() functions which do the same thing as H5*_init_interface() but can be called from other packages and don't do anything if the interface is already initialized. This fixes a couple memory leaks in applications that repeatedly close and open the library with H5close(). ./src/H5Tconv.c Optimized some data alignment code in the hardware conversion functions. Hardware conversions accumulate statistics about source and destination data alignment and print that information when the conversion function is unregistered (usually when the application exits) if data type debugging is compiled into the library and enabled at run-time. The conversion caching was cleaned up for the compound data type conversion function. It now caches conversion paths in a manner that will be MT-safe and is much simpler than the old method. Also cleaned up some array index maps. ./src/H5detect.c Fixd mispelling of alingemnt. ./src/H5private.h Changed `TRUE' to `1' in assignment to interface_initialize_g in FUNC_ENTER macro definition. ./tools/testh5dump.sh Completely rewritten to make it shorter, better documented, and conforming to most of the other test outputs. The comparison of the actual output with the expected output is insensitive to differences in white space. The test now passes for the first time on Linux where the output width wasn't as expected but the output was otherwise correct. ./tools/testfiles/tall-1.ddl ./tools/testfiles/tall-2.ddl ./tools/testfiles/tall-3.ddl ./tools/testfiles/tattr-1.ddl ./tools/testfiles/tattr-2.ddl ./tools/testfiles/tattr-3.ddl ./tools/testfiles/tattr-4.ddl ./tools/testfiles/tcomp-1.ddl ./tools/testfiles/tcomp-2.ddl ./tools/testfiles/tcomp-3.ddl ./tools/testfiles/tcomp-4.ddl ./tools/testfiles/tdset-1.ddl ./tools/testfiles/tdset-2.ddl ./tools/testfiles/tdset-3.ddl ./tools/testfiles/tdset-4.ddl ./tools/testfiles/tgroup-1.ddl ./tools/testfiles/tgroup-2.ddl ./tools/testfiles/tgroup-3.ddl ./tools/testfiles/tlink-1.ddl ./tools/testfiles/tlink-2.ddl ./tools/testfiles/tlink-3.ddl ./tools/testfiles/tlink-4.ddl ./tools/testfiles/tlink-5.ddl ./tools/testfiles/tslink-1.ddl ./tools/testfiles/tslink-2.ddl Changed `../h5dump' to just `h5dump'. ./config/alpha-dec-osf4.0 Added more warning and optimization switches to the native compiler.
Diffstat (limited to 'tools/testh5dump.sh')
-rwxr-xr-xtools/testh5dump.sh280
1 files changed, 85 insertions, 195 deletions
diff --git a/tools/testh5dump.sh b/tools/testh5dump.sh
index ea607d9..cb68db7 100755
--- a/tools/testh5dump.sh
+++ b/tools/testh5dump.sh
@@ -1,213 +1,103 @@
-#! /bin/sh
-# Test scripts for h5dump.
-# See the USAGE function for command usage.
+#!/bin/sh
+h5dump=h5dump # a relative name
+cmp='cmp -s'
+diff='diff -c'
-# Definitions of commands and variables
-CMD='../h5dump'
-RM='rm -f'
-DIFF=diff
-CMP='cmp -s'
-nerrors=0 # number of errors (0)
-quitonerr=0 # quit on error (not)
-noclean=0 # no cleaning temp. files (yes)
-only="" # dumper sub-command to test only
-except="" # dumper sub-command to test not
+nerrors=0
+verbose=yes
-
-# Definitions of functions/shorthands
-#
-
-# Print Usage of the command
-USAGE()
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Testing".
+TESTING()
{
- echo "Usage: $0 [-help] [-noclean] [-quit] [-except <command>] [-only <command>]"
- echo " -help: display help information"
- echo " -noclean: do not clean away temporary files"
- echo " -quit: quit immediately if any test fails"
- echo " -except: skip one specific command"
- echo " -only: test one specific command"
- echo "<command> can be one of {list, dumpsds, dumprig, dumpvd, dumpvg, dumpgr}"
+ SPACES=" "
+ echo "Testing $* $SPACES" |cut -c1-70 |tr -d '\n'
}
-# Print message with formats according to message level ($1)
-MESG()
+# 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.
+DUMP()
{
- level=$1
+ expect=testfiles/$1
+ actual="testfiles/`basename $1 .ddl`.out"
shift
- case $level in
- 0)
- echo '============================='
- echo $*
- echo '============================='
- ;;
- 3)
- echo '-----------------------------'
- echo $*
- echo '-----------------------------'
- ;;
- 6)
- echo "*** $* ***"
- ;;
- *)
- echo "MESG(): Unknown level ($level)"
- exit 1
- ;;
- esac
-
-}
-
-# Run the test to produce an output file which is then
-# compared with the expected ($1) output.
-# Note that this can be used to produce the expected
-# output files by replace "$output" with "$expected"
-# in the run-the-test commands.
-TEST()
-{
- # parse the arguments
- output=tmp.out
- expected=testfiles/$1
- shift
- # print a id banner
- MESG 6 $@
- # run the test
- (
+ # Run test.
+ TESTING $h5dump $@
+ (
echo "#############################"
- echo "Expected output for '$CMD $@'"
+ echo "Expected output for '$h5dump $@'"
echo "#############################"
cd testfiles
- $CMD "$@"
- ) > $output
- $CMP $expected $output
- if [ $? -ne 0 ]
- then
- echo $DIFF $expected $output
- $DIFF $expected $output
- echo " <<< FAILED >>>"
- nerrors=`expr $nerrors + 1`
- if [ $quitonerr -gt 0 ];
- then
- FINISH
- fi
+ ../$h5dump "$@" 2>/dev/null
+ ) >$actual
+
+ # Results. We normalize the result to account for different output
+ # widths. That is, the test should succeed if the only
+ # 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
+
+ if $cmp $expect-norm $actual-norm; then
+ echo " PASSED"
+ else
+ echo "*FAILED*"
+ echo " Actual result (*.out) differs from expected result (*.ddl)"
+ nerrors="`expr $nerrors + 1`"
+ test yes = "$verbose" && $diff $expect $actual |sed 's/^/ /'
fi
-# if [ $noclean -eq 0 ]
-# then
-# $RM $output
-# fi
-}
-
-# Report the result and exit
-FINISH()
-{
- if [ $nerrors -eq 0 ]
- then
- MESG 0 "All h5dump tests passed"
- else
- MESG 0 "h5dump tests failed: $nerrors"
+ # Clean up output file
+ rm -f $expect-norm $actual-norm
+ if [ X = ${HDF5_NOCLEANUP:-X} ]; then
+ rm -f $actual
fi
- exit $nerrors
}
-#===============
-# Main Body
-#===============
-
-# parse arguments
-while [ $# -gt 0 ]
-do
- case "$1" in
- "-quit")
- quitonerr=1
- ;;
- "-noclean")
- noclean=1
- ;;
- "-help")
- USAGE
- exit 0
- ;;
- "-only")
- shift
- case "$1" in
- "h5dump")
- only="$1"
- ;;
- *)
- echo "Unknown command: $1"
- USAGE
- exit 1
- ;;
- esac
- ;;
- "-except")
- shift
- case "$1" in
- "h5dump")
- except="$1"
- ;;
- *)
- echo "Unknown command: $1"
- USAGE
- exit 1
- ;;
- esac
- ;;
- * )
- echo "Unknow option: $1"
- USAGE
- exit 1
- ;;
- esac
- shift
-done
-
-# Print a beginning banner
-MESG 0 "Running h5dump tests"
-
-# Test command list
-TestCmd=h5dump
-TestName="Test command $TestCmd"
-if [ "$except" != $TestCmd -a \( -z "$only" -o "$only" = $TestCmd \) ]
-then
-MESG 3 "$TestName"
-TEST tgroup-1.ddl tgroup.h5
-TEST tgroup-2.ddl -g / tgroup.h5
-TEST tgroup-3.ddl -g /g2 /y tgroup.h5
-
-TEST tdset-1.ddl tdset.h5
-TEST tdset-2.ddl -d dset1 /dset2 tdset.h5
-TEST tdset-3.ddl -d /dset1 -header tdset.h5
-TEST tdset-4.ddl -d dset3 tdset.h5
-
-TEST tattr-1.ddl tattr.h5
-TEST tattr-2.ddl -a attr1 attr3 tattr.h5
-TEST tattr-3.ddl -header -a attr2 tattr.h5
-TEST tattr-4.ddl -a attr4 tattr.h5
-
-TEST tslink-1.ddl tslink.h5
-TEST tslink-2.ddl -l slink2 tslink.h5
-
-TEST thlink-1.ddl thlink.h5
-TEST thlink-2.ddl -d /g1/link2 /dset /g1/link1/link3 thlink.h5
-TEST thlink-3.ddl -d /dset /g1/link1/link3 /g1/link2 thlink.h5
-TEST thlink-4.ddl -g /g1 thlink.h5
-TEST thlink-5.ddl -d /dset -g /g2 -d /g1/link2 thlink.h5
-
-TEST tcomp-1.ddl tcompound.h5
-TEST tcomp-2.ddl -t /type1 /type2 /group1/type3 tcompound.h5
-TEST tcomp-3.ddl -d /group2/dset5 -g /group1 tcompound.h5
-TEST tcomp-4.ddl -t /#3432:0 -g /group2 tcompound.h5
-
-TEST tall-1.ddl tall.h5
-TEST tall-2.ddl -header -g /g1/g1.1 -a attr2 tall.h5
-TEST tall-3.ddl -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5
-
-else
-MESG 3 "$TestName <<<SKIPPED>>>"
-fi
-
-# End of test
-FINISH
+
+##############################################################################
+##############################################################################
+### T H E T E S T S ###
+##############################################################################
+##############################################################################
+
+DUMP tgroup-1.ddl tgroup.h5
+DUMP tgroup-2.ddl -g / tgroup.h5
+DUMP tgroup-3.ddl -g /g2 /y tgroup.h5
+
+DUMP tdset-1.ddl tdset.h5
+DUMP tdset-2.ddl -d dset1 /dset2 tdset.h5
+DUMP tdset-3.ddl -d /dset1 -header tdset.h5
+DUMP tdset-4.ddl -d dset3 tdset.h5
+
+DUMP tattr-1.ddl tattr.h5
+DUMP tattr-2.ddl -a attr1 attr3 tattr.h5
+DUMP tattr-3.ddl -header -a attr2 tattr.h5
+DUMP tattr-4.ddl -a attr4 tattr.h5
+
+DUMP tslink-1.ddl tslink.h5
+DUMP tslink-2.ddl -l slink2 tslink.h5
+
+DUMP thlink-1.ddl thlink.h5
+DUMP thlink-2.ddl -d /g1/link2 /dset /g1/link1/link3 thlink.h5
+DUMP thlink-3.ddl -d /dset /g1/link1/link3 /g1/link2 thlink.h5
+DUMP thlink-4.ddl -g /g1 thlink.h5
+DUMP thlink-5.ddl -d /dset -g /g2 -d /g1/link2 thlink.h5
+
+DUMP tcomp-1.ddl tcompound.h5
+DUMP tcomp-2.ddl -t /type1 /type2 /group1/type3 tcompound.h5
+DUMP tcomp-3.ddl -d /group2/dset5 -g /group1 tcompound.h5
+DUMP tcomp-4.ddl -t /#3432:0 -g /group2 tcompound.h5
+
+DUMP tall-1.ddl tall.h5
+DUMP tall-2.ddl -header -g /g1/g1.1 -a attr2 tall.h5
+DUMP tall-3.ddl -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5
+