From a72ecdf0051f9a1129bca6d687127f215a0e4b5d Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 8 Jun 2016 22:49:53 +0200
Subject: [PATCH] StoreGate INFO messages changing to VERBOSE.
(TestTools-00-07-38)
* Tagging TestTools-00-07-38.
* share/post.sh: StoreGate INFO messages changing to VERBOSE.
2016-05-03 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Taught the package how to build in standalone mode with
CMake.
* Tagging as TestTools-00-07-37
Former-commit-id: 031bb19047bc82b4fdc8acb5a54486cc57fe1240
---
AtlasTest/TestTools/CMakeLists.txt | 36 +++++++++++++++-------------
AtlasTest/TestTools/cmt/requirements | 1 -
AtlasTest/TestTools/share/post.sh | 3 +++
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/AtlasTest/TestTools/CMakeLists.txt b/AtlasTest/TestTools/CMakeLists.txt
index 092a55d876cbe..4345698b7b006 100644
--- a/AtlasTest/TestTools/CMakeLists.txt
+++ b/AtlasTest/TestTools/CMakeLists.txt
@@ -1,3 +1,4 @@
+# $Id: CMakeLists.txt 744649 2016-05-03 19:33:39Z krasznaa $
################################################################################
# Package: TestTools
################################################################################
@@ -6,25 +7,28 @@
atlas_subdir( TestTools )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaCommon
- TestPolicy
- PRIVATE
- GaudiKernel )
+atlas_depends_on_subdirs(
+ PUBLIC
+ Control/AthenaCommon
+ TestPolicy
+ PRIVATE
+ GaudiKernel )
-# External dependencies:
-find_package( PythonLibs )
-
-# Component(s) in the package:
-atlas_add_library( TestTools
- src/*.cxx
- PUBLIC_HEADERS TestTools
- INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
- LINK_LIBRARIES ${PYTHON_LIBRARIES}
- PRIVATE_LINK_LIBRARIES GaudiKernel )
+# In standalone mode we just use the headers from the package. While in
+# offline mode we build a proper library.
+if( XAOD_STANDALONE )
+ atlas_add_library( TestTools
+ TestTools/*.h
+ INTERFACE
+ PUBLIC_HEADERS TestTools )
+else()
+ atlas_add_library( TestTools
+ TestTools/*.h src/*.cxx
+ PUBLIC_HEADERS TestTools
+ PRIVATE_LINK_LIBRARIES GaudiKernel )
+endif()
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( share/runUnitTests.sh share/post.sh )
-
diff --git a/AtlasTest/TestTools/cmt/requirements b/AtlasTest/TestTools/cmt/requirements
index 8430b1ae826f9..c785e43bb6423 100644
--- a/AtlasTest/TestTools/cmt/requirements
+++ b/AtlasTest/TestTools/cmt/requirements
@@ -43,4 +43,3 @@ macro_append DOXYGEN_INPUT " ../doc"
macro_append DOXYGEN_INPUT " ../share"
macro_append DOXYGEN_FILE_PATTERNS " *.sh"
macro_append DOXYGEN_FILE_PATTERNS " *.txt"
-
diff --git a/AtlasTest/TestTools/share/post.sh b/AtlasTest/TestTools/share/post.sh
index c70315da53f26..4ea009d7ea35d 100755
--- a/AtlasTest/TestTools/share/post.sh
+++ b/AtlasTest/TestTools/share/post.sh
@@ -145,6 +145,9 @@ PP="$PP"'|^ConditionStore +INFO Stop ConditionStore'
# Differences between Gaudi versions.
PP="$PP"'|DEBUG input handles:|DEBUG output handles:|DEBUG Data Deps for|DEBUG Property update for OutputLevel :|-ExtraInputs |-ExtraOutputs |-Cardinality |-IsClonable |-NeededResources |-Timeline '
+# StoreGate INFO messages changed to VERBOSE
+PP="$PP"'|^StoreGateSvc +(INFO|VERBOSE) (Stop|stop|Start)'
+
if [ "$extrapatterns" != "" ]; then
PP="$PP""|$extrapatterns"
--
GitLab