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/misc | |
| 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/misc')
| -rw-r--r-- | tools/misc/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | tools/misc/testh5mkgrp.sh.in | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tools/misc/CMakeTests.cmake b/tools/misc/CMakeTests.cmake index d065b63..ee60bf8 100644 --- a/tools/misc/CMakeTests.cmake +++ b/tools/misc/CMakeTests.cmake @@ -76,8 +76,6 @@ COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.h5 - ${resultfile}.out - ${resultfile}.out.err ) set_tests_properties (H5MKGRP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") endif () @@ -118,8 +116,6 @@ COMMAND ${CMAKE_COMMAND} -E remove ${resultfile}.h5 - ${resultfile}.out - ${resultfile}.out.err ) set_tests_properties (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") add_test ( diff --git a/tools/misc/testh5mkgrp.sh.in b/tools/misc/testh5mkgrp.sh.in index 190e824..a0413e1 100644 --- a/tools/misc/testh5mkgrp.sh.in +++ b/tools/misc/testh5mkgrp.sh.in @@ -117,7 +117,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_H5MKGRP_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 |