From 59ce3e8d2f7c70746aa51a6c35cfd5e9db9c4f19 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 26 May 2016 21:15:04 +0200
Subject: [PATCH] 'Do not fail if we cannot find run_tpcnv_test.'
(TrkEventAthenaPool-01-34-21)
* Tagging TrkEventAthenaPool-01-34-21.
* CMakeLists.txt: Do not fail if we cannot find run_tpcnv_test.
2016-05-24 scott snyder <snyder@bnl.gov>
* Tagging TrkEventAthenaPool-01-34-20.
* CMakeLists.txt: Fix for finding AthenaPoolUtilitiesTest.
2016-05-19 scott snyder <snyder@bnl.gov>
* Tagging TrkEventAthenaPool-01-34-19.
* Update reference files for change in default geometry.
2016-05-15 scott snyder <snyder@bnl.gov>
* Tagging TrkEventAthenaPool-01-34-18.
* Update reference files for TrkTrack-07-02-01.
2016-05-13 scott snyder <snyder@bnl.gov>
...
(Long ChangeLog diff - truncated)
Former-commit-id: cf8c47997ab8ea42d7f4508d845ea4b340325b90
---
.../TrkEventAthenaPool/CMakeLists.txt | 18 ++++++++++++++++++
.../share/TrkEventTPCnv_18.0.0_test.py | 4 ++--
.../share/TrkEventTPCnv_20.1.7.2_test.py | 4 ++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
index 1fb971d1aad..43fd9df07c5 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
@@ -42,3 +42,21 @@ atlas_add_poolcnv_library( TrkEventAthenaPoolPoolCnv
atlas_install_headers( TrkEventAthenaPool )
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( TrkEventTPCnv_14.5.0 AOD-14.5.0-full )
+ run_tpcnv_test( TrkEventTPCnv_15.6.7 AOD-15.6.7-full )
+ run_tpcnv_test( TrkEventTPCnv_16.6.2.1 AOD-16.6.2.1-full )
+ run_tpcnv_test( TrkEventTPCnv_17.2.8 AOD-17.2.8-full )
+ run_tpcnv_test( TrkEventTPCnv_18.0.0 AOD-18.0.0-full )
+ run_tpcnv_test( TrkEventTPCnv_20.1.7.2 ESD-20.1.7.2 )
+else()
+ message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
index 44d3cf28299..20898f1e0e3 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
@@ -18,7 +18,7 @@ keys = [
'MuGirlSegments',
]
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
+#from AthenaCommon.JobProperties import jobproperties
+#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
index 98e2179791b..5a119dc5570 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
@@ -20,7 +20,7 @@ keys = [
'MuonSegments',
]
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
+#from AthenaCommon.JobProperties import jobproperties
+#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
include ('AthenaPoolUtilities/TPCnvTest.py')
--
GitLab