From: Matthias Maier Date: Thu, 14 Jul 2016 15:46:06 +0000 (-0500) Subject: CTest: Do not try to manipulate xml submission files with sed X-Git-Tag: v8.5.0-rc1~870^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1461dad7e3fe196f6a051c9f68a3b8ce0017618b;p=dealii.git CTest: Do not try to manipulate xml submission files with sed Due to this sed magic we might end up with two identical keys in Configure.xml. Unfortunately, this terribly confuses CDash. --- diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake index d31bd451c3..4d0b2825ed 100644 --- a/tests/run_testsuite.cmake +++ b/tests/run_testsuite.cmake @@ -523,27 +523,6 @@ Unable to determine test submission files from TAG. Bailing out. ) ENDIF() -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - # - # Only use the following sed command on GNU userlands: - # - # TODO: Come up with a more robust way to inject this that also works on - # BSD and Mac - # - FILE(GLOB _xml_files ${_path}/*.xml) - EXECUTE_PROCESS(COMMAND sed -i -e - s/CompilerName=\\"\\"/CompilerName=\\"${_compiler_name}\\"\\n\\tCompilerVersion=\\"${_compiler_version}\\"/g - ${_xml_files} - OUTPUT_QUIET RESULT_VARIABLE _res - ) - IF(NOT "${_res}" STREQUAL "0") - MESSAGE(FATAL_ERROR " - \"sed\" failed. Bailing out. - " - ) - ENDIF() -ENDIF() - FILE(WRITE ${_path}/Update.xml "