philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r27933] Cmake 3.3 allowed execute_process to merge output and error files if the filename or the variable were the same.

Browse Source 
Changed instances to make the outpu_variable different.
This commit is contained in:
Allen Byrne
2015-10-02 12:55:08 -05:00
parent b9d27c0ed3
commit af5c2697a1
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/cmake/vfdTest.cmake
View File

@@ -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