From fc7eee25cebbb83d3d0b1e1019aa010c78085c6d Mon Sep 17 00:00:00 2001
From: Denis Damazio <damazio@mail.cern.ch>
Date: Wed, 22 Jul 2020 14:16:20 +0200
Subject: [PATCH] Continues to move tests from TrigUpgraTest to better suited
packages
---
Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt | 3 +++
.../TrigT2CaloCommon}/share/Calo.py | 0
.../TrigT2CaloCommon}/share/CaloRinger.py | 0
.../TrigT2CaloCommon/test/test_t2calo_cf_build.sh} | 0
.../TrigT2CaloCommon/test/test_t2calo_only_build.sh} | 2 +-
.../TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh} | 2 +-
6 files changed, 5 insertions(+), 2 deletions(-)
rename Trigger/{TrigValidation/TrigUpgradeTest => TrigAlgorithms/TrigT2CaloCommon}/share/Calo.py (100%)
rename Trigger/{TrigValidation/TrigUpgradeTest => TrigAlgorithms/TrigT2CaloCommon}/share/CaloRinger.py (100%)
rename Trigger/{TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh => TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh} (100%)
rename Trigger/{TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh => TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh} (92%)
rename Trigger/{TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh => TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh} (90%)
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
index 38fcdcf5050..118cc52bb73 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
@@ -37,3 +37,6 @@ endfunction( _add_test )
_add_test( TestService test/test_dataaccess.sh )
_add_test( TestServiceNewJO test/test_dataaccessNewJO.sh )
+_add_test( caloCf test/test_t2calo_cf_build.sh )
+_add_test( caloOnly test/test_t2calo_only_build.sh )
+_add_test( caloRinger test/test_t2calo_ringer_only_build.sh )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/Calo.py
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
rename to Trigger/TrigAlgorithms/TrigT2CaloCommon/share/Calo.py
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/CaloRinger.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/CaloRinger.py
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/CaloRinger.py
rename to Trigger/TrigAlgorithms/TrigT2CaloCommon/share/CaloRinger.py
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
rename to Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh
similarity index 92%
rename from Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
rename to Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh
index ff59ca560c7..7ab73ae4541 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh
@@ -8,7 +8,7 @@
export EVENTS=20
export THREADS=1
export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/Calo.py"
+export JOBOPTION="TrigT2CaloCommon/Calo.py"
# Skip dumping chain counts because this test doesn't produce the histogram including them
export SKIP_CHAIN_DUMP=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh
similarity index 90%
rename from Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
rename to Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh
index 48035fac8b1..1de726f2d48 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh
@@ -8,7 +8,7 @@
export EVENTS=20
export THREADS=1
export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/CaloRinger.py"
+export JOBOPTION="TrigT2CaloCommon/CaloRinger.py"
# Skip dumping chain counts because this test doesn't produce the histogram including them
export SKIP_CHAIN_DUMP=1
--
GitLab