From 91baf441dec6fec0c2423a6a67a97fd0454a4e13 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 6 Dec 2013 16:11:49 +0000 Subject: [PATCH] Revert "Testsuite: Reenable compiler version injection on non Linux platforms" git-svn-id: https://svn.dealii.org/trunk@31912 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/scripts/run_testsuite.cmake | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/deal.II/cmake/scripts/run_testsuite.cmake b/deal.II/cmake/scripts/run_testsuite.cmake index 0657ea3e30..f4605d6760 100644 --- a/deal.II/cmake/scripts/run_testsuite.cmake +++ b/deal.II/cmake/scripts/run_testsuite.cmake @@ -582,21 +582,27 @@ Unable to determine test submission files from TAG. Bailing out. ) ENDIF() - -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. -" +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() - IF(NOT "${_svn_WC_REVISION}" STREQUAL "") FILE(WRITE ${_path}/Update.xml " -- 2.39.5