summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-04-08 20:01:10 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-04-08 20:01:10 (GMT)
commite4c9340564fe34e7f2d9d57649bf128a4b1076e8 (patch)
treef084926376a91b90e1796585a7d52f989328cf45
parent0f49c47ee1ebcb4e26b352a208aa327c19d01cde (diff)
downloadhdf5-e4c9340564fe34e7f2d9d57649bf128a4b1076e8.zip
hdf5-e4c9340564fe34e7f2d9d57649bf128a4b1076e8.tar.gz
hdf5-e4c9340564fe34e7f2d9d57649bf128a4b1076e8.tar.bz2
[svn-r20452] Pass value of last test variable into sub-macro of add-test for diff tests.
-rw-r--r--tools/h5copy/CMakeLists.txt10
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 90ad711..b15f5c1 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -95,7 +95,7 @@ IF (BUILD_TESTING)
SET_TESTS_PROPERTIES (H5COPY_F-${testname} PROPERTIES DEPENDS ${last_test})
ENDIF (NOT "${last_test}" STREQUAL "")
SET (last_test "H5COPY_F-${testname}")
- ADD_H5_DIFF_TEST (${testname} ${resultcode} ${infile} ${outfile} ${srcname} ${dstname})
+ ADD_H5_DIFF_TEST (${testname} ${resultcode} ${last_test} ${infile} ${outfile} ${srcname} ${dstname})
ENDMACRO (ADD_H5_F_TEST)
MACRO (ADD_H5_TEST testname resultcode infile outfile vparam sparam srcname dparam dstname)
@@ -107,19 +107,17 @@ IF (BUILD_TESTING)
SET_TESTS_PROPERTIES (H5COPY-${testname} PROPERTIES DEPENDS ${last_test})
ENDIF (NOT "${last_test}" STREQUAL "")
SET (last_test "H5COPY-${testname}")
- ADD_H5_DIFF_TEST (${testname} ${resultcode} ${infile} ${outfile} ${srcname} ${dstname})
+ ADD_H5_DIFF_TEST (${testname} ${resultcode} ${last_test} ${infile} ${outfile} ${srcname} ${dstname})
ENDMACRO (ADD_H5_TEST)
- MACRO (ADD_H5_DIFF_TEST testname resultcode infile outfile srcname dstname)
+ MACRO (ADD_H5_DIFF_TEST testname resultcode testdepends infile outfile srcname dstname)
# resultcode=2 will cause the test to skip the diff test
IF (NOT ${resultcode} STREQUAL "2")
ADD_TEST (
NAME H5COPY-DIFF_${testname}
COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${infile} ./testfiles/${outfile} ${srcname} ${dstname}
)
- IF (NOT "${last_test}" STREQUAL "")
- SET_TESTS_PROPERTIES(H5COPY-DIFF_${testname} PROPERTIES DEPENDS ${last_test})
- ENDIF (NOT "${last_test}" STREQUAL "")
+ SET_TESTS_PROPERTIES(H5COPY-DIFF_${testname} PROPERTIES DEPENDS ${testdepends})
SET (last_test "H5COPY-DIFF_${testname}")
IF (${resultcode} STREQUAL "1")
SET_TESTS_PROPERTIES (H5COPY-DIFF_${testname} PROPERTIES WILL_FAIL "true")