Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/run_test.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ execute_process(COMMAND ruby ${GZ_SCRIPT}
# previous results.
execute_process(COMMAND
${CMAKE_COMMAND} -E copy
"${TEST_NAME}_fail.xml"
"${TEST_NAME}_fail.xml.configured"
"../test_results/${TEST_NAME}.xml"
)

Expand All @@ -17,7 +17,7 @@ if (${TEST_OUTPUT} MATCHES "Test executed" AND NOT
(${TEST_ERROR} MATCHES "Library error")))
execute_process(COMMAND
${CMAKE_COMMAND} -E copy
"${TEST_NAME}_pass.xml"
"${TEST_NAME}_pass.xml.configured"
"../test_results/${TEST_NAME}.xml"
)
else()
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ if(BUILD_TESTING)

configure_file(
"${PROJECT_SOURCE_DIR}/tools/junit_pass.xml.in"
"${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}_pass.xml"
"${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}_pass.xml.configured"
@ONLY)

configure_file(
"${PROJECT_SOURCE_DIR}/tools/junit_fail.xml.in"
"${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}_fail.xml"
"${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}_fail.xml.configured"
@ONLY)

# This simply executes gz. The output will be tested in the check_* test
Expand Down
Loading