From 79ba0b9f13017cb50cd22cbcc9fec04d69a17ac9 Mon Sep 17 00:00:00 2001
From: Dominik Smith <smith@th.physik.uni-frankfurt.de>
Date: Wed, 8 Sep 2021 16:31:47 +0200
Subject: [PATCH] Rearranged tests in macro/run/CMakeLists.txt. Changed naming
convention such that FIXTURES_SETUP is named after the current test and
FIXTURES_REQUIRED contains names of required tests.
---
macro/run/CMakeLists.txt | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index d1f123a438..25b4a93f94 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -69,6 +69,30 @@ foreach(setup IN LISTS cbm_setup)
set(sname test)
endif()
+ # --- Test run_transport_json_config
+ # --- Transport run using run_transport_json_config.C
+ set(testname run_transport_json_config)
+ add_test(${testname} ${MACRO_DIR}/run_transport_json_config.sh)
+ set_tests_properties(${testname} PROPERTIES
+ TIMEOUT ${timeOutTime}
+ PASS_REGULAR_EXPRESSION "Macro finished successfully"
+ FIXTURES_REQUIRED cleanup
+ FIXTURES_SETUP fixt_tra_json_config
+ RESOURCE_LOCK json_config_ParDb
+ )
+
+ # --- Test run_digi_json_config
+ # --- Digitization run with using run_digi_json_config.C
+ set(testname run_digi_json_config)
+ add_test(${testname} ${MACRO_DIR}/run_digi_json_config.sh)
+ set_tests_properties(${testname} PROPERTIES
+ TIMEOUT ${timeOutTime}
+ PASS_REGULAR_EXPRESSION "Macro finished successfully"
+ FIXTURES_REQUIRED fixt_tra_json_config
+ FIXTURES_SETUP fixt_digi_json_config
+ RESOURCE_LOCK json_config_ParDb
+ )
+
# --- Test run_tra_coll
# --- Transport run with collision events, using run_tra_file.C
set(testname run_${sname}_tra_coll)
@@ -150,6 +174,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ev_${setup}
+ FIXTURES_SETUP fixt_reco_ev_ideal_${setup}
RESOURCE_LOCK collParDb_${setup}
)
@@ -164,6 +189,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ev_${setup}
+ FIXTURES_SETUP fixt_reco_ev_real_${setup}
RESOURCE_LOCK collParDb_${setup}
)
@@ -178,6 +204,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ts_${setup}
+ FIXTURES_SETUP fixt_reco_ts_eb_ideal_${setup}
RESOURCE_LOCK collParDb_${setup}
)
@@ -192,6 +219,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ts_${setup}
+ FIXTURES_SETUP fixt_reco_ts_eb_real_${setup}
RESOURCE_LOCK collParDb_${setup}
)
@@ -205,6 +233,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED fixt_digi_ts_${setup}
+ FIXTURES_SETUP fixt_reco_ts_tb_${setup}
RESOURCE_LOCK collParDb_${setup}
)
--
GitLab