diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2017-03-01 18:33:32 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2017-03-01 18:33:32 (GMT) |
commit | 1f4602f73b46fc4de4e711d4d743c9b049179ea2 (patch) | |
tree | 9d86754744e837bf61ec79ac9fbe051d907e98cb /tools/h5stat | |
parent | 718f16c86456ada744aac3e7e74ea40ae95f11da (diff) | |
download | hdf5-1f4602f73b46fc4de4e711d4d743c9b049179ea2.zip hdf5-1f4602f73b46fc4de4e711d4d743c9b049179ea2.tar.gz hdf5-1f4602f73b46fc4de4e711d4d743c9b049179ea2.tar.bz2 |
HDFFV-10120 verify nozlib checks and synchronize scripts with develop
Diffstat (limited to 'tools/h5stat')
-rw-r--r-- | tools/h5stat/CMakeTests.cmake | 8 | ||||
-rw-r--r-- | tools/h5stat/testh5stat.sh.in | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tools/h5stat/CMakeTests.cmake b/tools/h5stat/CMakeTests.cmake index 00ce250..a3db0fc 100644 --- a/tools/h5stat/CMakeTests.cmake +++ b/tools/h5stat/CMakeTests.cmake @@ -75,11 +75,6 @@ endif () else (HDF5_ENABLE_USING_MEMCHECKER) add_test ( - NAME H5STAT-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} - -E remove ${resultfile}.out ${resultfile}.out.err - ) - add_test ( NAME H5STAT-${resultfile} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>" @@ -90,7 +85,6 @@ -D "TEST_REFERENCE=${resultfile}.ddl" -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) - set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS "H5STAT-${resultfile}-clear-objects") endif () ENDMACRO () @@ -194,7 +188,7 @@ ADD_H5_TEST (h5stat_filters-UD 0 -D h5stat_filters.h5) ADD_H5_TEST (h5stat_filters-UT 0 -T h5stat_filters.h5) # h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c -# as of release 1.8.0-alpha4 +# as of release 1.8.7-snap0 (on a 64-bit machine) ADD_H5_TEST (h5stat_tsohm 0 h5stat_tsohm.h5) # h5stat_newgrat.h5 is generated by h5stat_gentest.c ADD_H5_TEST (h5stat_newgrat 0 h5stat_newgrat.h5) diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in index 4d698da..9ceb943 100644 --- a/tools/h5stat/testh5stat.sh.in +++ b/tools/h5stat/testh5stat.sh.in @@ -149,7 +149,7 @@ CLEAN_TESTFILES_AND_TESTDIR() # skip rm if srcdir is same as destdir # this occurs when build/test performed in source dir and # make cp fail - SDIR=`$DIRNAME $tstfile` + SDIR=$SRC_H5STAT_TESTFILES INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then |