From b775d14d7ad27851fa9bf3077ad226f301785718 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 10 Mar 2023 19:10:47 +0100
Subject: [PATCH] [GEOMETRY-UPGRADE] Various fixes/improvements for unit test

---
 Geometry/CMSCommonData/test/BuildFile.xml       | 5 +----
 Geometry/CMSCommonData/test/TestIntegration.cpp | 3 ---
 Geometry/CMSCommonData/test/run_DOMCount.sh     | 8 +++-----
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 Geometry/CMSCommonData/test/TestIntegration.cpp

diff --git a/Geometry/CMSCommonData/test/BuildFile.xml b/Geometry/CMSCommonData/test/BuildFile.xml
index 7ea643ea11556..a4356605e0083 100644
--- a/Geometry/CMSCommonData/test/BuildFile.xml
+++ b/Geometry/CMSCommonData/test/BuildFile.xml
@@ -6,7 +6,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<bin file="TestIntegration.cpp" name="GeometryDOMCount">
-  <flags TEST_RUNNER_ARGS=" /bin/bash Geometry/CMSCommonData/test run_DOMCount.sh"/>
-  <use name="FWCore/Utilities"/>
-</bin>
+<test name="GeometryDOMCount" command="run_DOMCount.sh"/>
diff --git a/Geometry/CMSCommonData/test/TestIntegration.cpp b/Geometry/CMSCommonData/test/TestIntegration.cpp
deleted file mode 100644
index b2991bd18ae57..0000000000000
--- a/Geometry/CMSCommonData/test/TestIntegration.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-RUNTEST()
diff --git a/Geometry/CMSCommonData/test/run_DOMCount.sh b/Geometry/CMSCommonData/test/run_DOMCount.sh
index 720218a7fe64a..5621e12b3cca4 100755
--- a/Geometry/CMSCommonData/test/run_DOMCount.sh
+++ b/Geometry/CMSCommonData/test/run_DOMCount.sh
@@ -2,8 +2,7 @@
 
 function die { echo Failure $1: status $2 ; exit $2 ; }
 
-pushd ${LOCAL_TMP_DIR}
-
+export LOCAL_TOP_DIR=${CMSSW_BASE}
 rm -f run_DOMCount.log
 echo "Normal output of DOMCount is written to file tmp/${SCRAM_ARCH}/run_DOMCount.log"
 
@@ -40,7 +39,7 @@ cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometryXML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometryZeroMaterialXML_cfi"
 
 # automatically retrieve active phase 2 geometries
-read -a DETS <<< $(python3 -c 'from Configuration.Geometry.dict2026Geometry import detectorVersionDict; print " ".join(sorted([x[1] for x in detectorVersionDict.items()]))')
+read -a DETS <<< $(python3 -c 'from Configuration.Geometry.dict2026Geometry import detectorVersionDict; print (" ".join(sorted([x[1] for x in detectorVersionDict.items()])))')
 for DET in ${DETS[@]}; do
 	cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometry2026${DET}XML_cfi"
 done
@@ -48,7 +47,7 @@ done
 for cfiFile in ${cfiFiles}
 do
   echo "run_DOMCount.py $cfiFile" | tee -a run_DOMCount.log
-  ${LOCAL_TEST_DIR}/run_DOMCount.py $cfiFile >> run_DOMCount.log 2>&1 || die "run_DOMCount.py $cfiFile" $?
+  ${SCRAM_TEST_PATH}/run_DOMCount.py $cfiFile >> run_DOMCount.log 2>&1 || die "run_DOMCount.py $cfiFile" $?
 done
 
 # Errors in the xml files and also missing xml or schema files will
@@ -67,5 +66,4 @@ else
     exit 1
 fi
 
-popd
 exit 0