From 51a9efe16912e0b8616ba8805978e80272c769ea Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 2 Jan 2015 02:58:32 +0100 Subject: [PATCH] Testsuite: Do not write revision.log, this is now done in setup_git.cmake --- tests/run_testsuite.cmake | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake index 1bc5a9a6cc..7339eaa1d5 100644 --- a/tests/run_testsuite.cmake +++ b/tests/run_testsuite.cmake @@ -1,6 +1,6 @@ ## --------------------------------------------------------------------- ## -## Copyright (C) 2013 - 2014 by the deal.II authors +## Copyright (C) 2013 - 2015 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -335,7 +335,7 @@ IF(NOT GIT_FOUND) ENDIF() EXECUTE_PROCESS( - COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%H %h %ae" + COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY} OUTPUT_VARIABLE _git_WC_INFO RESULT_VARIABLE _result @@ -346,14 +346,8 @@ IF(NOT ${_result} EQUAL 0) MESSAGE(FATAL_ERROR "\nCould not retrieve git information. Bailing out.\n") ENDIF() -STRING(REGEX REPLACE "^\"([^ ]+) ([^ ]+) ([^\"]+)\"" - "\\1" _git_WC_REV "${_git_WC_INFO}") - -STRING(REGEX REPLACE "^\"([^ ]+) ([^ ]+) ([^\"]+)\"" - "\\2" _git_WC_SHORTREV "${_git_WC_INFO}") - -STRING(REGEX REPLACE "^\"([^ ]+) ([^ ]+) ([^\"]+)\"" - "\\3" _git_WC_AUTHOR "${_git_WC_INFO}") +STRING(REGEX REPLACE "^\"([^ ]+)\"" + "\\1" _git_WC_SHORTREV "${_git_WC_INFO}") EXECUTE_PROCESS( COMMAND ${GIT_EXECUTABLE} symbolic-ref HEAD @@ -366,21 +360,6 @@ EXECUTE_PROCESS( STRING(REGEX REPLACE "refs/heads/" "" _git_WC_BRANCH "${_git_WC_BRANCH}") -# -# Write revision log: -# - -FILE(WRITE ${CTEST_BINARY_DIRECTORY}/revision.log -"### -# -# Git information: -# Branch: ${_git_WC_BRANCH} -# Commit: ${_git_WC_REV} -# Author: ${_git_WC_AUTHOR} -# -###" - ) - IF(NOT "${_git_WC_BRANCH}" STREQUAL "") SET(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-${_git_WC_BRANCH}") ENDIF() -- 2.39.5