summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-11-09 16:37:04 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-11-09 16:37:04 (GMT)
commitf9674dfe4ea4e1054c6f7a862f2bac99bceedd36 (patch)
tree0098584db243e9e9c7dbb400f4bb964e8b8d9d93 /tools/test
parentc5ca4224967270dadc2d78d2a964f297552f2248 (diff)
downloadhdf5-f9674dfe4ea4e1054c6f7a862f2bac99bceedd36.zip
hdf5-f9674dfe4ea4e1054c6f7a862f2bac99bceedd36.tar.gz
hdf5-f9674dfe4ea4e1054c6f7a862f2bac99bceedd36.tar.bz2
On windows there could be a conflict when two processes try to read the
same file
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/h5dump/CMakeTests.cmake14
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index dad3a8b..b08bcc5 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -183,6 +183,14 @@
${HDF5_TOOLS_DIR}/testfiles/out3.h5import
${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl
)
+ set (HDF5_N_REFERENCE_FILES
+ ${HDF5_TOOLS_DIR}/testfiles/tall-3
+ ${HDF5_TOOLS_DIR}/testfiles/tattr-2
+ ${HDF5_TOOLS_DIR}/testfiles/tcomp-2
+ ${HDF5_TOOLS_DIR}/testfiles/thlink-4
+ ${HDF5_TOOLS_DIR}/testfiles/thlink-5
+ ${HDF5_TOOLS_DIR}/testfiles/tslink-2
+ )
set (HDF5_REFERENCE_EXP_FILES
tall-6.exp
tnoddlfile.exp
@@ -331,6 +339,10 @@
get_filename_component (fname "${tst_h5_file}" NAME)
HDFTEST_COPY_FILE("${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
endforeach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES})
+ foreach (tst_h5_file ${HDF5_N_REFERENCE_TEST_FILES})
+ get_filename_component (fname "${tst_h5_file}" NAME)
+ HDFTEST_COPY_FILE("${tst_h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}-N.ddl" "h5dump_std_files")
+ endforeach (tst_h5_file ${HDF5_N_REFERENCE_TEST_FILES})
foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
if (WIN32)
@@ -466,7 +478,7 @@
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
-D "TEST_OUTPUT=${resultfile}-N.out"
-D "TEST_EXPECT=${resultcode}"
- -D "TEST_REFERENCE=${resultfile}.ddl"
+ -D "TEST_REFERENCE=${resultfile}-N.ddl"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DEPENDS "H5DUMP-N-${resultfile}-clear-objects")