diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-11-01 22:10:50 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-11-01 22:10:50 (GMT) |
| commit | 2b0d8d59ae24d870f21726912c43aeac64425fde (patch) | |
| tree | 7b50941acb0b3e75f225b1b674033399d4d8f73a /config | |
| parent | a960b232c176132ca027e64e1803076b39fc4d3d (diff) | |
| download | hdf5-2b0d8d59ae24d870f21726912c43aeac64425fde.zip hdf5-2b0d8d59ae24d870f21726912c43aeac64425fde.tar.gz hdf5-2b0d8d59ae24d870f21726912c43aeac64425fde.tar.bz2 | |
[svn-r19706] Added VFD test options.
Bring r19705 from branch
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/vfdTest.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake index c0b5fec..2e854fb 100644 --- a/config/cmake/vfdTest.cmake +++ b/config/cmake/vfdTest.cmake @@ -18,6 +18,8 @@ IF (NOT TEST_VFD) MESSAGE (FATAL_ERROR "Require TEST_VFD to be defined") ENDIF (NOT TEST_VFD) +SET (ERROR_APPEND 1) + MESSAGE (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}") SET (ENV{HDF5_DRIVER} "${TEST_VFD}") @@ -25,12 +27,19 @@ SET (ENV{HDF5_DRIVER} "${TEST_VFD}") EXECUTE_PROCESS ( COMMAND ${TEST_PROGRAM} ${TEST_ARGS} WORKING_DIRECTORY ${TEST_FOLDER} + OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out + ERROR_FILE ${TEST_OUTPUT}_${TEST_VFD}.err OUTPUT_VARIABLE TEST_ERROR ERROR_VARIABLE TEST_ERROR ) MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}") +IF (ERROR_APPEND) + FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM) + FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}") +ENDIF (ERROR_APPEND) + # if the return value is !=${TEST_EXPECT} bail out IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT}) MESSAGE ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}") |