mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r12416] Purpose: Maintenance

Browse Source 
Description: Added test script and two test files in the tools/misc/testfiles
             directory for testing h5stat tool; modified Makefile.am in tools/misc
             and configure.in files to run the new test script; reran bin/recofigure
             to update relevant configuration files; updated MANIFEST

Solution:

Platforms tested: heping with in place and srcdir builds; will do more testing
                  after the checkin.

Misc. update:
This commit is contained in:
Elena Pourmal 2006-06-17 13:16:05 -05:00
parent abce343da8
commit b7beca9770
8 changed files with 180 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MANIFEST
View File

@ -886,6 +886,9 @@
./tools/misc/h5stat.c
./tools/misc/repart_test.c
./tools/misc/testh5repart.sh.in
./tools/misc/testh5stat.sh.in
./tools/misc/testfiles/h5stat_help1.ddl
./tools/misc/testfiles/h5stat_help2.ddl
./tools/testfiles/family_file00000.h5
./tools/testfiles/family_file00001.h5

3
configure vendored
View File

@ -51935,7 +51935,7 @@ if test -n "$TESTPARALLEL"; then
fi
fi
ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh examples/Makefile c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile hl/Makefile hl/src/Makefile hl/test/Makefile hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/misc/testh5stat.sh examples/Makefile c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile hl/Makefile hl/src/Makefile hl/test/Makefile hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
cat >confcache <<\_ACEOF
@ -52587,6 +52587,7 @@ do
"tools/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/misc/Makefile" ;;
"tools/misc/h5cc" ) CONFIG_FILES="$CONFIG_FILES tools/misc/h5cc" ;;
"tools/misc/testh5repart.sh" ) CONFIG_FILES="$CONFIG_FILES tools/misc/testh5repart.sh" ;;
"tools/misc/testh5stat.sh" ) CONFIG_FILES="$CONFIG_FILES tools/misc/testh5stat.sh" ;;
"examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"c++/Makefile" ) CONFIG_FILES="$CONFIG_FILES c++/Makefile" ;;
"c++/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES c++/src/Makefile" ;;

1
configure.in
View File

@ -3354,6 +3354,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
tools/misc/Makefile
tools/misc/h5cc
tools/misc/testh5repart.sh
tools/misc/testh5stat.sh
examples/Makefile
c++/Makefile
c++/src/Makefile

6
tools/misc/Makefile.am
View File

@ -24,11 +24,11 @@ INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
#test script and program
TEST_PROG=h5repart_gentest
TEST_SCRIPT=testh5repart.sh
TEST_SCRIPT=testh5repart.sh testh5stat.sh
check_PROGRAMS=$(TEST_PROG) repart_test
check_SCRIPTS=$(TEST_SCRIPT)
SCRIPT_DEPEND=h5repart$(EXEEXT)
SCRIPT_DEPEND=h5repart$(EXEEXT) h5stat$(EXEEXT)
# These are our main targets, the tools
bin_PROGRAMS=h5debug h5repart h5stat
@ -43,7 +43,7 @@ CLEANFILES=h5redeploy
CHECK_CLEANFILES+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
# These were generated by configure. Remove them only when distclean.
DISTCLEANFILES=h5cc testh5repart.sh
DISTCLEANFILES=h5cc testh5repart.sh testh5stat.sh
# All programs rely on hdf5 library and h5tools library
LDADD=$(LIBH5TOOLS) $(LIBHDF5)

12
tools/misc/Makefile.in
View File

@ -57,7 +57,7 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/h5cc.in $(srcdir)/testh5repart.sh.in \
$(top_srcdir)/config/commence.am \
$(srcdir)/testh5stat.sh.in $(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
check_PROGRAMS = $(am__EXEEXT_1) repart_test$(EXEEXT)
bin_PROGRAMS = h5debug$(EXEEXT) h5repart$(EXEEXT) h5stat$(EXEEXT)
@ -68,7 +68,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES = h5cc testh5repart.sh
CONFIG_CLEAN_FILES = h5cc testh5repart.sh testh5stat.sh
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
am__EXEEXT_1 = h5repart_gentest$(EXEEXT)
@ -367,16 +367,16 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \
#test script and program
TEST_PROG = h5repart_gentest
TEST_SCRIPT = testh5repart.sh
TEST_SCRIPT = testh5repart.sh testh5stat.sh
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5repart$(EXEEXT)
SCRIPT_DEPEND = h5repart$(EXEEXT) h5stat$(EXEEXT)
bin_SCRIPTS = h5redeploy
# Tell automake to clean h5redeploy script
CLEANFILES = h5redeploy
# These were generated by configure. Remove them only when distclean.
DISTCLEANFILES = h5cc testh5repart.sh
DISTCLEANFILES = h5cc testh5repart.sh testh5stat.sh
# All programs rely on hdf5 library and h5tools library
LDADD = $(LIBH5TOOLS) $(LIBHDF5)
@ -439,6 +439,8 @@ h5cc: $(top_builddir)/config.status $(srcdir)/h5cc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
testh5repart.sh: $(top_builddir)/config.status $(srcdir)/testh5repart.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
testh5stat.sh: $(top_builddir)/config.status $(srcdir)/testh5stat.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"

22
tools/misc/testfiles/h5stat_help1.ddl Normal file
View File

@ -0,0 +1,22 @@
#############################
Expected output for 'h5stat -h'
#############################
This tool is under development. For detailed information
please see the specification document at
http://hdf.ncsa.uiuc.edu/RFC/h5stat/h5stat-spec.pdf
Please send your comments and questions to help@hdfgroup.org
Usage: h5stat [OPTIONS] file
OPTIONS
-h, --help Print a usage message and exit
-f, --file Print file information
-F, --filemetadata Print file metadata
-g, --group Print group information
-G, --groupmetadata Print group metadata
-d, --dset Print dataset information
-D, --dsetmetadata Print dataset metadata
-T, --dtypemetadata Print datatype metadata

22
tools/misc/testfiles/h5stat_help2.ddl Normal file
View File

@ -0,0 +1,22 @@
#############################
Expected output for 'h5stat --help'
#############################
This tool is under development. For detailed information
please see the specification document at
http://hdf.ncsa.uiuc.edu/RFC/h5stat/h5stat-spec.pdf
Please send your comments and questions to help@hdfgroup.org
Usage: h5stat [OPTIONS] file
OPTIONS
-h, --help Print a usage message and exit
-f, --file Print file information
-F, --filemetadata Print file metadata
-g, --group Print group information
-G, --groupmetadata Print group metadata
-d, --dset Print dataset information
-D, --dsetmetadata Print dataset metadata
-T, --dtypemetadata Print datatype metadata

120
tools/misc/testh5stat.sh.in Normal file
View File

@ -0,0 +1,120 @@
#! /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
# Determine which filters are available
USE_FILTER_SZIP="@USE_FILTER_SZIP@"
USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
USE_FILTER_SHUFFLE="@USE_FILTER_SHUFFLE@"
USE_FILTER_FLETCHER32="@USE_FILTER_FLETCHER32@"
USE_FILTER_NBIT="@USE_FILTER_NBIT@"
USE_FILTER_SCALEOFFSET="@USE_FILTER_SCALEOFFSET@"
STAT=h5stat # The tool name
STAT_BIN=`pwd`/$STAT # 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 $STAT $@
(
echo "#############################"
echo "Expected output for '$STAT $@'"
echo "#############################"
cd $srcdir/testfiles
$RUNSERIAL $STAT_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
}
# Print a "SKIP" message
SKIP() {
TESTING $STAT $@
echo " -SKIP-"
}
##############################################################################
##############################################################################
### T H E T E S T S ###
##############################################################################
##############################################################################
# test for help flag
TOOLTEST h5stat_help1.ddl -h
TOOLTEST h5stat_help2.ddl --help
echo
if test $nerrors -eq 0 ; then
echo "All $STAT tests passed."
fi
exit $nerrors