From dc4e3596fb7fdbdc4fc09de11a78bff2c5d22860 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 11 Aug 2023 11:25:16 +0200 Subject: [PATCH] adapt DQM/Integration unit test infrastructure to run on GPUvsCPU streamer files --- .../python/clients/ecalgpu_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/hcalgpu_dqm_sourceclient-live_cfg.py | 4 ++-- DQM/Integration/test/BuildFile.xml | 3 +++ DQM/Integration/test/runtest.sh | 8 +++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/DQM/Integration/python/clients/ecalgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecalgpu_dqm_sourceclient-live_cfg.py index c35ce62ddb17a..e62d67e468478 100644 --- a/DQM/Integration/python/clients/ecalgpu_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ecalgpu_dqm_sourceclient-live_cfg.py @@ -11,8 +11,8 @@ ### Load cfis ### if unitTest: - process.load("DQM.Integration.config.unittestinputsource_cfi") - from DQM.Integration.config.unittestinputsource_cfi import options + process.load("DQM.Integration.config.unitteststreamerinputsource_cfi") + from DQM.Integration.config.unitteststreamerinputsource_cfi import options else: process.load("DQM.Integration.config.inputsource_cfi") from DQM.Integration.config.inputsource_cfi import options diff --git a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py index ce4c84b1e9003..7c1c674c61265 100644 --- a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py @@ -37,8 +37,8 @@ else: process.load('DQM.Integration.config.FrontierCondition_GT_cfi') if unitTest: - process.load("DQM.Integration.config.unittestinputsource_cfi") - from DQM.Integration.config.unittestinputsource_cfi import options + process.load("DQM.Integration.config.unitteststreamerinputsource_cfi") + from DQM.Integration.config.unitteststreamerinputsource_cfi import options elif useFileInput: process.load("DQM.Integration.config.fileinputsource_cfi") from DQM.Integration.config.fileinputsource_cfi import options diff --git a/DQM/Integration/test/BuildFile.xml b/DQM/Integration/test/BuildFile.xml index bfd02a4c970c0..fd4050d9d6e2a 100644 --- a/DQM/Integration/test/BuildFile.xml +++ b/DQM/Integration/test/BuildFile.xml @@ -23,6 +23,9 @@ + + + diff --git a/DQM/Integration/test/runtest.sh b/DQM/Integration/test/runtest.sh index 7df483274cf09..b8a99f61ab9b2 100755 --- a/DQM/Integration/test/runtest.sh +++ b/DQM/Integration/test/runtest.sh @@ -16,4 +16,10 @@ if [[ -z ${CLIENTS_DIR} ]]; then fi mkdir -p $LOCAL_TEST_DIR/upload -cmsRun $CLIENTS_DIR/$1 unitTest=True + +if [[ $# -eq 1 ]]; then + cmsRun $CLIENTS_DIR/$1 unitTest=True +else + echo "Will use streamers files for run $2" + cmsRun $CLIENTS_DIR/$1 unitTest=True runNumber=$2 +fi