summaryrefslogtreecommitdiffstats
path: root/config/cmake/userblockTest.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-02-25 17:26:14 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-02-25 17:26:14 (GMT)
commit62ed2477212befd276abe5c7f6d96f49bf788ba8 (patch)
treebed907f47323b13fbb4536aab774337c6c31f848 /config/cmake/userblockTest.cmake
parent0272351e49184bde54c2e79dcbc4f9cb07184971 (diff)
downloadhdf5-62ed2477212befd276abe5c7f6d96f49bf788ba8.zip
hdf5-62ed2477212befd276abe5c7f6d96f49bf788ba8.tar.gz
hdf5-62ed2477212befd276abe5c7f6d96f49bf788ba8.tar.bz2
[svn-r23318] HDFFV-8311: Improve tools testing and eliminate dependency problems
Tested: local linux
Diffstat (limited to 'config/cmake/userblockTest.cmake')
-rw-r--r--config/cmake/userblockTest.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake
index 5e8a808..8910bb2 100644
--- a/config/cmake/userblockTest.cmake
+++ b/config/cmake/userblockTest.cmake
@@ -65,17 +65,17 @@ IF (TEST_CHECKUB STREQUAL "YES")
COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
WORKING_DIRECTORY ${TEST_FOLDER}
RESULT_VARIABLE TEST_RESULT
- OUTPUT_FILE ${TEST_UFILE}.cmp
+ OUTPUT_FILE ${TEST_HFILE}-ub.cmp
OUTPUT_VARIABLE TEST_ERROR
ERROR_VARIABLE TEST_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
#cat $ufile >> $cmpfile
FILE (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
- FILE (APPEND ${TEST_UFILE}.cmp "${TEST_STREAM}")
+ FILE (APPEND ${TEST_HFILE}-ub.cmp "${TEST_STREAM}")
ELSE (NOT TEST_O_STRING_LEN STREQUAL "0")
FILE (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
- FILE (WRITE ${TEST_UFILE}.cmp ${TEST_STREAM})
+ FILE (WRITE ${TEST_HFILE}-ub.cmp ${TEST_STREAM})
ENDIF (NOT TEST_O_STRING_LEN STREQUAL "0")
#$JAM_BIN/getub -c $size $hfile > $tfile
@@ -91,14 +91,14 @@ IF (TEST_CHECKUB STREQUAL "YES")
# now compare the outputs
EXECUTE_PROCESS (
- COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_UFILE}.cmp ${TEST_HFILE}.cmp
+ COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
RESULT_VARIABLE TEST_RESULT
)
MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}+${TEST_O_STRING_LEN}")
# if the return value is !=${TEST_EXPECT} bail out
IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
- MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_UFILE} did not match ${TEST_HFILE}.\n${TEST_ERROR}")
+ MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_HFILE}-ub did not match ${TEST_HFILE}.\n${TEST_ERROR}")
ENDIF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
ELSE (TEST_CHECKUB STREQUAL "YES")
# call 'ubsize' to get the size of the user block