Merge pull request #41133 from smuzaffar/dqm-fix-unit-test9

[DQM] Various fixes/improvements for unit test
cms-sw · Mar 23, 2023 · e292ad5 · e292ad5
2 parents 9cb2d62 + 7aa1c82
commit e292ad5
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 92 deletions.
diff --git a/DQMServices/Components/test/BuildFile.xml b/DQMServices/Components/test/BuildFile.xml
@@ -2,11 +2,5 @@
 <use name="roothistmatrix"/>
 <use name="protobuf"/>
 <use name="cppunit"/>
-<environment>
-  <bin name="runFastHadd" file="runFastHadd.cpp">
-    <flags TEST_RUNNER_ARGS=" /bin/bash DQMServices/Components/test run_fastHadd_tests.sh"/>
-  </bin>
-
-</environment>
-<bin file="testSchemaEvolution.cpp">
-</bin>
+<test name="runFastHadd" command="run_fastHadd_tests.sh"/>
+<bin file="testSchemaEvolution.cpp"/>
diff --git a/DQMServices/Components/test/runFastHadd.cpp b/DQMServices/Components/test/runFastHadd.cpp
diff --git a/DQMServices/Components/test/run_fastHadd_tests.sh b/DQMServices/Components/test/run_fastHadd_tests.sh
@@ -22,7 +22,7 @@ set_up() {
 generate() {
     echo "Generating files"
 
-    python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a produce -n $numFiles 2>&1 > /dev/null
+    python3 ${SCRAM_TEST_PATH}/test_fastHaddMerge.py -a produce -n $numFiles 2>&1 > /dev/null
 
     if [ $? -ne 0 ]; then
         exit $?
@@ -65,7 +65,7 @@ hadd_merge() {
 check_hadd() {
     echo "Checking ROOT result..."
 
-    python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumRootFile 2>&1 > /dev/null
+    python3 ${SCRAM_TEST_PATH}/test_fastHaddMerge.py -a check -n $numFiles -c $cumRootFile 2>&1 > /dev/null
 
     if [ $? -ne 0 ]; then
         exit $?
@@ -101,7 +101,7 @@ convertPB2ROOT() {
 check_fasthadd() {
     echo "Checking PB result... on ${cumPBFile_inROOT}"
 
-    python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFile_inROOT 2>&1 > /dev/null
+    python3 ${SCRAM_TEST_PATH}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFile_inROOT 2>&1 > /dev/null
 
     if [ $? -ne 0 ]; then
         exit $?
@@ -135,7 +135,7 @@ convert() {
 check_fasthadd_parallel() {
     echo "Checking PB result... on ${cumPBFileThreaded_inROOT}"
 
-    python3 ${LOCAL_TEST_DIR}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFileThreaded_inROOT 2>&1 > /dev/null
+    python3 ${SCRAM_TEST_PATH}/test_fastHaddMerge.py -a check -n $numFiles -c $cumPBFileThreaded_inROOT 2>&1 > /dev/null
 
     if [ $? -ne 0 ]; then
         exit $?

diff --git a/DQMServices/Demo/test/BuildFile.xml b/DQMServices/Demo/test/BuildFile.xml
@@ -6,6 +6,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<bin file="TestRunner.cpp" name="TestDQMServicesDemo">
-  <flags TEST_RUNNER_ARGS=" /bin/bash DQMServices/Demo/test runtests.sh"/>
-</bin>
+<test name="TestDQMServicesDemo" command="runtests.sh"/>
diff --git a/DQMServices/Demo/test/TestRunner.cpp b/DQMServices/Demo/test/TestRunner.cpp
diff --git a/DQMServices/Demo/test/runtests.sh b/DQMServices/Demo/test/runtests.sh
diff --git a/Validation/CTPPS/test/BuildFile.xml b/Validation/CTPPS/test/BuildFile.xml
@@ -1,4 +1 @@
-<bin name="TestCTPPSDirectProtonSimulation" file="TestDriver.cc">
-  <flags TEST_RUNNER_ARGS=" /bin/bash Validation/CTPPS/test/simu run_multiple"/>
-  <use name="FWCore/Utilities"/>
-</bin>
+<test name="TestCTPPSDirectProtonSimulation" command="simu/run_multiple"/>
diff --git a/Validation/CTPPS/test/simu/run_multiple b/Validation/CTPPS/test/simu/run_multiple
@@ -7,9 +7,9 @@ then
 fi
 
 inputDir="."
-if [ -n "$LOCAL_TEST_DIR" ]
+if [ -n "$SCRAM_TEST_PATH" ]
 then
-	inputDir="$LOCAL_TEST_DIR"
+	inputDir="$SCRAM_TEST_PATH/simu"
 	n_events="1E2"
 fi