summaryrefslogtreecommitdiffstats
path: root/tools/h5import
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-05-03 17:56:23 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-05-03 17:56:23 (GMT)
commit907a5a1df061e3343d6783c354574fcbb409f73b (patch)
tree7314cd2cc9d7b64aa7c32ae00f6319fc7a4366c3 /tools/h5import
parent344352d88e5e0359b4b727fcbe88917822dd06a3 (diff)
downloadhdf5-907a5a1df061e3343d6783c354574fcbb409f73b.zip
hdf5-907a5a1df061e3343d6783c354574fcbb409f73b.tar.gz
hdf5-907a5a1df061e3343d6783c354574fcbb409f73b.tar.bz2
[svn-r20713] Packed Bits Merge:
removed option defines and #ifdef/#endif refactored all printf to HDfprintf in h5dump.c formatted and indention improvements synched with 1.8 branch Tested: local linux
Diffstat (limited to 'tools/h5import')
-rw-r--r--tools/h5import/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index a2955db..39945d3 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -136,7 +136,7 @@ IF (BUILD_TESTING)
# If using memchecker add tests without using scripts
IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ADD_TEST (
- NAME H5IMPORT-H5DUMP-${testname}
+ NAME H5IMPORT-H5DMP-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=${testfile}"
@@ -147,9 +147,9 @@ IF (BUILD_TESTING)
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
- SET_TESTS_PROPERTIES (H5IMPORT-H5DUMP-${testname} PROPERTIES DEPENDS H5IMPORT-${testname})
+ SET_TESTS_PROPERTIES (H5IMPORT-H5DMP-${testname} PROPERTIES DEPENDS H5IMPORT-${testname})
ADD_TEST (
- NAME H5IMPORT-H5DUMP_CMP-${testname}
+ NAME H5IMPORT-H5DMP_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=testfiles/${testfile}"
@@ -160,8 +160,8 @@ IF (BUILD_TESTING)
-D "TEST_REFERENCE=${testfile}.new"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
- SET_TESTS_PROPERTIES (H5IMPORT-H5DUMP_CMP-${testname} PROPERTIES DEPENDS H5IMPORT-H5DUMP-${testname})
- SET (last_test "H5IMPORT-H5DUMP_CMP-${testname}")
+ SET_TESTS_PROPERTIES (H5IMPORT-H5DMP_CMP-${testname} PROPERTIES DEPENDS H5IMPORT-H5DMP-${testname})
+ SET (last_test "H5IMPORT-H5DMP_CMP-${testname}")
ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ENDMACRO (ADD_H5_TEST testname resultcode testfile vparam srcname dstname)