summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-04-08 21:20:47 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-04-08 21:20:47 (GMT)
commit0c032eef216fbe9a1e530fe3d5d00127f9f8fd7e (patch)
tree39f2dd9a347890009f5a8099b26a9d8cee547dbd /tools
parentc480a8c7172ad99d3093063fb7e7619cbc6c8626 (diff)
downloadhdf5-0c032eef216fbe9a1e530fe3d5d00127f9f8fd7e.zip
hdf5-0c032eef216fbe9a1e530fe3d5d00127f9f8fd7e.tar.gz
hdf5-0c032eef216fbe9a1e530fe3d5d00127f9f8fd7e.tar.bz2
[svn-r20458] Change handling of reference files so that the output of import is restored
HDFFV-5930
Diffstat (limited to 'tools')
-rw-r--r--tools/h5import/CMakeLists.txt14
1 files changed, 3 insertions, 11 deletions
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index 9d4ec1b..a2955db 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -99,16 +99,7 @@ IF (BUILD_TESTING)
)
ENDFOREACH (txt_file ${HDF5_REFERENCE_TXT_FILES})
- FILE (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/tmp_testfiles")
FOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES})
- SET (tmpdest "${PROJECT_BINARY_DIR}/tmp_testfiles/${h5_file}")
- #MESSAGE (STATUS " Copying ${h5_file}")
- ADD_CUSTOM_COMMAND (
- TARGET h5import
- POST_BUILD
- COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different ${HDF5_TOOLS_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file} ${tmpdest}
- )
SET (dest "${PROJECT_BINARY_DIR}/testfiles/${h5_file}")
#MESSAGE (STATUS " Copying ${h5_file}")
ADD_CUSTOM_COMMAND (
@@ -148,7 +139,7 @@ IF (BUILD_TESTING)
NAME H5IMPORT-H5DUMP-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
- -D "TEST_ARGS:STRING=testfiles/${testfile}"
+ -D "TEST_ARGS:STRING=${testfile}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=${testfile}.new"
-D "TEST_EXPECT=0"
@@ -161,7 +152,7 @@ IF (BUILD_TESTING)
NAME H5IMPORT-H5DUMP_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
- -D "TEST_ARGS:STRING=tmp_testfiles/${testfile}"
+ -D "TEST_ARGS:STRING=testfiles/${testfile}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=${testfile}.out"
-D "TEST_EXPECT=0"
@@ -194,6 +185,7 @@ IF (BUILD_TESTING)
binuin32.bin
txtin16.txt
txtin32.txt
+ ${HDF5_REFERENCE_TEST_FILES}
)
ADD_TEST (NAME H5IMPORT-h5importtest COMMAND $<TARGET_FILE:h5importtest>)