Merge pull request #41033 from smuzaffar/dqm-fix-unit-test6

[DQM] Various fixes/improvements for unit test

DQMServices/FwkIO/test/BuildFile.xml

@@ -8,6 +8,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<bin file="TestIntegration.cpp" name="TestDQMServicesFwkIOScripts">
-  <flags TEST_RUNNER_ARGS=" /bin/bash DQMServices/FwkIO/test run_tests.sh"/>
-</bin>
+<test name="TestDQMServicesFwkIOScripts" command="run_tests.sh"/>

DQMServices/FwkIO/test/run_tests.sh

@@ -2,9 +2,7 @@
 
 function die { echo Failure $1: status $2 ; exit $2 ; }
 
-echo LOCAL_TMP_DIR = ${LOCAL_TMP_DIR}
-
-pushd ${LOCAL_TMP_DIR}
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
   testConfig=create_run_only_file_cfg.py
   rm -f dqm_run_only.root
   echo ${testConfig} ------------------------------------------------------------
@@ -183,6 +181,4 @@ pushd ${LOCAL_TMP_DIR}
   echo ${testConfig} ------------------------------------------------------------
   cmsRun -p ${LOCAL_TEST_DIR}/${testConfig} && die "cmsRun ${testConfig}" $?
 
-popd
-
 exit 0

DQMServices/StreamerIO/test/BuildFile.xml

@@ -7,6 +7,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<bin file="RunThis_t.cpp" name="DQMServicesStreamerIORunStreamer">
-  <flags TEST_RUNNER_ARGS="/bin/bash DQMServices/StreamerIO/test RunStreamer.sh"/>
-</bin>
+<test name="DQMServicesStreamerIORunStreamer" command="RunStreamer.sh"/>

DQMServices/StreamerIO/test/RunStreamer.sh

@@ -2,45 +2,31 @@
 
 function die { echo Failure $1: status $2 ; exit $2 ; }
 
-if [ -z  $LOCAL_TEST_DIR ]; then
-LOCAL_TEST_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -z $SCRAM_TEST_PATH ]; then
+SCRAM_TEST_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 fi
-echo "LOCAL_TEST_DIR = $LOCAL_TEST_DIR"
-
-if [ -z  $LOCAL_TMP_DIR ]; then
-LOCAL_TMP_DIR="/tmp"
-fi
-echo "LOCAL_TMP_DIR = $LOCAL_TMP_DIR"
-
-cd $LOCAL_TEST_DIR
+echo "LOCAL_TEST_DIR = $SCRAM_TEST_PATH"
 
 RC=0
-P=$$
-PREFIX=results_${USER}${P}
-OUTDIR=${LOCAL_TMP_DIR}/${PREFIX}
-
-mkdir ${OUTDIR}
-cp *_cfg.py ${OUTDIR}
-cd ${OUTDIR}
 
 mkdir run000001
 #the initial json file to read
 echo "{\"data\" :[10,10, \"teststreamfile.dat\"]}" >  run000001/run1_ls1_test.jsn
-cmsRun streamOut_cfg.py > out 2>&1 || die "cmsRun streamOut_cfg.py" $?
+cmsRun ${SCRAM_TEST_PATH}/streamOut_cfg.py > out 2>&1 || die "cmsRun streamOut_cfg.py" $?
 mv teststreamfile.dat run000001/teststreamfile.dat
-cmsRun streamOutAlt_cfg.py  > outAlt 2>&1 || die "cmsRun streamOutAlt_cfg.py" $?
-cmsRun streamOutExt_cfg.py  > outExt 2>&1 || die "cmsRun streamOutExt_cfg.py" $?
-timeout --signal SIGTERM 180 cmsRun streamIn_cfg.py  > in  2>&1 || die "cmsRun streamIn_cfg.py" $?
+cmsRun ${SCRAM_TEST_PATH}/streamOutAlt_cfg.py  > outAlt 2>&1 || die "cmsRun streamOutAlt_cfg.py" $?
+cmsRun ${SCRAM_TEST_PATH}/streamOutExt_cfg.py  > outExt 2>&1 || die "cmsRun streamOutExt_cfg.py" $?
+timeout --signal SIGTERM 180 cmsRun ${SCRAM_TEST_PATH}/streamIn_cfg.py  > in  2>&1 || die "cmsRun streamIn_cfg.py" $?
 
 echo "{\"data\" :[10,10, \"teststreamfile.dat\"]}" >  run000001/run1_ls1_testAlt.jsn
 mv teststreamfile_alt.dat run000001/teststreamfile_alt.dat
 rm run000001/run000001_ls0000_EoR.jsn
-timeout --signal SIGTERM 180 cmsRun  streamInAlt_cfg.py  > alt  2>&1 || die "cmsRun streamInAlt_cfg.py" $?
+timeout --signal SIGTERM 180 cmsRun ${SCRAM_TEST_PATH}/streamInAlt_cfg.py  > alt  2>&1 || die "cmsRun streamInAlt_cfg.py" $?
 
 echo "{\"data\" :[10,10, \"teststreamfile.dat\"]}" >  run000001/run1_ls1_testExt.jsn
 rm run000001/run000001_ls0000_EoR.jsn
 mv teststreamfile_ext.dat run000001/teststreamfile_ext.dat
-timeout --signal SIGTERM 180 cmsRun streamInExt_cfg.py  > ext  2>&1 || die "cmsRun streamInExt_cfg.py" $?
+timeout --signal SIGTERM 180 cmsRun ${SCRAM_TEST_PATH}/streamInExt_cfg.py  > ext  2>&1 || die "cmsRun streamInExt_cfg.py" $?
 
 # echo "CHECKSUM = 1" > out
 # echo "CHECKSUM = 1" > in
@@ -61,5 +47,4 @@ then
     RC=1
 fi
 
-#rm -rf ${OUTDIR}
 exit ${RC}