From: maier Date: Thu, 26 Sep 2013 00:23:05 +0000 (+0000) Subject: Add revision back to build name for now, add branch to xml as well X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a38fe89f606697c4ca2fdb4276b4ae9dcc40b2c;p=dealii-svn.git Add revision back to build name for now, add branch to xml as well git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30938 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake index b5182410ca..c3682aa7f5 100644 --- a/tests/run_testsuite.cmake +++ b/tests/run_testsuite.cmake @@ -281,7 +281,7 @@ IF(${_result} EQUAL 0) STRING(REGEX REPLACE "^${_svn_WC_ROOT}/" "" _branch ${_svn_WC_URL}) STRING(REGEX REPLACE "^branches/" "" _branch ${_branch}) STRING(REGEX REPLACE "/deal.II$" "" _branch ${_branch}) - SET(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${_branch}") + SET(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${_branch}-r${_svn_WC_REVISION}") ENDIF() # @@ -390,7 +390,7 @@ IF(NOT EXISTS ${_path}) ENDIF() FILE(GLOB _xml_files ${_path}/*.xml) EXECUTE_PROCESS(COMMAND sed -i -e - s/CompilerName=\"\"/CompilerName=\"${_compiler_name}\"\\n\\tCompilerVersion=\"${_compiler_version}\"\\n\\tSVNRevision=\"${_svn_WC_REVISION}\"/g + s/CompilerName=\"\"/CompilerName=\"${_compiler_name}\"\\n\\tCompilerVersion=\"${_compiler_version}\"\\n\\tSVNBranch=\"${_branch}\"\\n\\tSVNRevision=\"${_svn_WC_REVISION}\"/g ${_xml_files} OUTPUT_QUIET RESULT_VARIABLE _res )