'Do not fail if we cannot find run_tpcnv_test.' (CaloAthenaPool-00-03-07)

	* Tagging Tagging CaloAthenaPool-00-03-07.
	* CMakeLists.txt: Do not fail if we cannot find run_tpcnv_test.

2016-05-24  scott snyder  <snyder@bnl.gov>

	* Tagging Tagging CaloAthenaPool-00-03-06.
	* CMakeLists.txt: Fix for finding AthenaPoolUtilitiesTest.

2016-05-23  scott snyder  <snyder@bnl.gov>

	* Tagging Tagging CaloAthenaPool-00-03-05.
	* Get tests working in cmake builds.


Former-commit-id: 016a4da64021cfd3f2b9ce9d19a39768e54de2de

Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt

@@ -29,3 +29,20 @@ atlas_add_poolcnv_library( CaloAthenaPoolPoolCnv
 atlas_install_headers( CaloAthenaPool )
 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( CaloTPCnv_14.5.0   AOD-14.5.0-full )
+  run_tpcnv_test( CaloTPCnv_15.1.0   AOD-15.1.0-full )
+  run_tpcnv_test( CaloTPCnv_15.5.0   AOD-15.5.0-full )
+  run_tpcnv_test( CaloTPCnv_18.0.0   ESD-18.0.0 )
+  run_tpcnv_test( CaloTPCnv_20.1.7.2 ESD-20.1.7.2 )
+else()
+   message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()   

Calorimeter/CaloCnv/CaloAthenaPool/cmt/requirements

@@ -67,3 +67,4 @@ apply_pattern athenarun_test \
    options="CaloAthenaPool/CaloTPCnv_20.1.7.2_test.py" \
    pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh CaloTPCnv_20.1.7.2" \
    post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh CaloTPCnv_20.1.7.2"
+

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0_test.py

@@ -52,8 +52,8 @@ keys = [
     'CombinedTower',
          ]
 
-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'
 
 from AthenaCommon.DetFlags      import DetFlags
 DetFlags.detdescr.Calo_setOn()

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2_test.py

@@ -9,8 +9,8 @@ keys = [
     'CaloCalTopoClusters_links@10',
          ]
 
-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'
 
 from AthenaCommon.DetFlags      import DetFlags
 DetFlags.detdescr.Calo_setOn()