summaryrefslogtreecommitdiffstats
path: root/config/cmake/vfdTest.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2015-10-02 17:55:08 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2015-10-02 17:55:08 (GMT)
commitaf5c2697a170108421fc2b0e5dfd7cc7daa082ee (patch)
tree4ef58434bc4836334539f990cd98b0b31e95bad4 /config/cmake/vfdTest.cmake
parentb9d27c0ed3c20d70e1bb197fb37853508eea216c (diff)
downloadhdf5-af5c2697a170108421fc2b0e5dfd7cc7daa082ee.zip
hdf5-af5c2697a170108421fc2b0e5dfd7cc7daa082ee.tar.gz
hdf5-af5c2697a170108421fc2b0e5dfd7cc7daa082ee.tar.bz2
[svn-r27933] Cmake 3.3 allowed execute_process to merge output and error files if the filename or the variable were the same.
Changed instances to make the outpu_variable different.
Diffstat (limited to 'config/cmake/vfdTest.cmake')
-rw-r--r--config/cmake/vfdTest.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake
index d3cb87e..4685d88 100644
--- a/config/cmake/vfdTest.cmake
+++ b/config/cmake/vfdTest.cmake
@@ -29,7 +29,7 @@ EXECUTE_PROCESS (
WORKING_DIRECTORY ${TEST_FOLDER}
OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out
ERROR_FILE ${TEST_OUTPUT}_${TEST_VFD}.err
- OUTPUT_VARIABLE TEST_ERROR
+ OUTPUT_VARIABLE TEST_OUT
ERROR_VARIABLE TEST_ERROR
)
@@ -37,7 +37,7 @@ 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}")
+ file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}")
endif (ERROR_APPEND)
# if the return value is !=${TEST_EXPECT} bail out