From 66d05f74fb6ac0c672876010b1ded607459a74e2 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 26 May 2016 19:39:10 +0200
Subject: [PATCH] 'Fix cmake warning.' (RecAthenaPool-00-07-10)
* Tagging RecAthenaPool-00-07-10.
* CMakeLists.txt: Fix cmake warning.
* Tagging RecAthenaPool-00-07-09.
* Get tests working in cmake build.
Former-commit-id: f61081e0252590b1ca47de52f03f52750e4e1b28
---
Reconstruction/RecAthenaPool/CMakeLists.txt | 17 ++++++++++++++++-
.../RecAthenaPool/share/RecTPCnv_18.0.0_test.py | 3 ---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Reconstruction/RecAthenaPool/CMakeLists.txt b/Reconstruction/RecAthenaPool/CMakeLists.txt
index 3fce1dbf45a..efe5dc72c78 100644
--- a/Reconstruction/RecAthenaPool/CMakeLists.txt
+++ b/Reconstruction/RecAthenaPool/CMakeLists.txt
@@ -24,10 +24,25 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_poolcnv_library( RecAthenaPoolPoolCnv
src/*.cxx
FILES MissingETEvent/MissingEtCalo.h MissingETEvent/MissingEtTruth.h MissingETEvent/MissingET.h MissingETEvent/MissingETComposition.h muonEvent/MuonSpShowerContainer.h muonEvent/MuonCaloEnergyContainer.h muonEvent/MuonContainer.h src/MuonCaloEnergies.h
- TYPES_WITH_NAMESPACE MuonCaloEnergyContainer Rec::MuonSpShowerContainer Analysis::MuonContainer TPCnv::MuonCaloEnergies
+ TYPES_WITH_NAMESPACE Rec::MuonSpShowerContainer Analysis::MuonContainer TPCnv::MuonCaloEnergies
LINK_LIBRARIES AthenaPoolUtilities SGTools StoreGateLib SGtests AthenaPoolCnvSvcLib GaudiKernel MissingETEvent muonEvent RecTPCnv )
# Install files from the package:
atlas_install_headers( RecAthenaPool )
atlas_install_joboptions( share/*.py )
+# Set up (a) test(s) for the converter(s):
+if( IS_DIRECTORY ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities )
+ set( AthenaPoolUtilitiesTest_DIR
+ ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities/cmake )
+endif()
+find_package( AthenaPoolUtilitiesTest )
+
+if( ATHENAPOOLUTILITIESTEST_FOUND )
+ run_tpcnv_test( RecTPCnv_15.0.0 AOD-15.0.0-full )
+ run_tpcnv_test( RecTPCnv_15.6.1 AOD-15.6.1-full )
+ run_tpcnv_test( RecTPCnv_17.0.6 AOD-17.0.6-full )
+ run_tpcnv_test( RecTPCnv_18.0.0 AOD-18.0.0-full )
+else()
+ message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()
diff --git a/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py b/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py
index aef33630ff7..acdc6f91f8c 100644
--- a/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py
+++ b/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py
@@ -47,7 +47,4 @@ keys = [
'MuonSpShowers',
]
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
include ('AthenaPoolUtilities/TPCnvTest.py')
--
GitLab