diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-01-23 13:48:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-01-23 13:48:54 (GMT) |
| commit | 5650be2d1a2cb514355706d0ccdfd43519244a0e (patch) | |
| tree | 01e2b4fbe1827a9895f886186923e6fa346b9bed | |
| parent | ff421d9424233c92547e2bb649324983bf86c9dd (diff) | |
| download | hdf5-5650be2d1a2cb514355706d0ccdfd43519244a0e.zip hdf5-5650be2d1a2cb514355706d0ccdfd43519244a0e.tar.gz hdf5-5650be2d1a2cb514355706d0ccdfd43519244a0e.tar.bz2 | |
[svn-r23193] Rename ddl export file and force file write on copy for windows.
Tested: local linux
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | tools/h5dump/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 6 | ||||
| -rw-r--r-- | tools/testfiles/twithddl.exp (renamed from tools/testfiles/twithddl.ddl) | 0 |
4 files changed, 6 insertions, 6 deletions
@@ -1585,7 +1585,7 @@ ./tools/testfiles/tbigdims.h5 ./tools/testfiles/thyperslab.h5 ./tools/testfiles/twidedisplay.ddl -./tools/testfiles/twithddl.ddl +./tools/testfiles/twithddl.exp ./tools/testfiles/twithddlfile.ddl ./tools/testfiles/twithddlfile.exp diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 321b446..1d0012e 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -191,7 +191,6 @@ IF (BUILD_TESTING) ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/twidedisplay.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddl.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddlfile.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/h5dump-help.txt ${HDF5_TOOLS_SRC_DIR}/testfiles/out3.h5import @@ -202,6 +201,7 @@ IF (BUILD_TESTING) trawdatafile.exp tstr2bin2.exp tstr2bin6.exp + twithddl.exp twithddlfile.exp ) SET (HDF5_REFERENCE_TEST_FILES @@ -1282,7 +1282,7 @@ IF (BUILD_TESTING) ADD_TEST ( NAME H5DUMP-output-cmp-meta-twithddlfile COMMAND ${CMAKE_COMMAND} - -E compare_files twithddl.txt twithddl.ddl + -E compare_files twithddl.txt twithddl.exp ) SET_TESTS_PROPERTIES (H5DUMP-output-cmp-meta-twithddlfile PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std") IF (NOT "${last_test}" STREQUAL "") diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 667908b..d3270d7 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -316,7 +316,7 @@ $SRC_H5DUMP_TESTFILES/tvldtypes5.ddl $SRC_H5DUMP_TESTFILES/tvlstr.ddl $SRC_H5DUMP_TESTFILES/tvms.ddl $SRC_H5DUMP_TESTFILES/twidedisplay.ddl -$SRC_H5DUMP_TESTFILES/twithddl.ddl +$SRC_H5DUMP_TESTFILES/twithddl.exp $SRC_H5DUMP_TESTFILES/twithddlfile.ddl $SRC_H5DUMP_TESTFILES/twithddlfile.exp $SRC_H5DUMP_TESTFILES/h5dump-help.txt @@ -510,7 +510,7 @@ TOOLTEST2A() { actual_err="$TESTDIR/`basename $1 .exp`.err" shift expectmeta="$TESTDIR/$1" - actualmeta="$TESTDIR/`basename $1 .ddl`.txt" + actualmeta="$TESTDIR/`basename $1 .exp`.txt" shift # Run test. @@ -805,7 +805,7 @@ TOOLTEST tnoattrddl.ddl --enable-error-stack --ddl=NULL -y tattr.h5 TOOLTEST tnoattrdata.ddl --enable-error-stack -A --output=NULL tattr.h5 TOOLTEST2 trawdatafile.exp --enable-error-stack -y -o trawdatafile.txt packedbits.h5 TOOLTEST2 tnoddlfile.exp --enable-error-stack --ddl=NULL -y -o tnoddlfile.txt packedbits.h5 -TOOLTEST2A twithddlfile.exp twithddl.ddl --enable-error-stack --ddl=twithddl.txt -y -o twithddlfile.txt packedbits.h5 +TOOLTEST2A twithddlfile.exp twithddl.exp --enable-error-stack --ddl=twithddl.txt -y -o twithddlfile.txt packedbits.h5 # test for maximum display datasets TOOLTEST twidedisplay.ddl --enable-error-stack -w0 packedbits.h5 diff --git a/tools/testfiles/twithddl.ddl b/tools/testfiles/twithddl.exp index f99d906..f99d906 100644 --- a/tools/testfiles/twithddl.ddl +++ b/tools/testfiles/twithddl.exp |