From 451396eb0235e364b9c86cb5504ebb057e6b1cc7 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 17 Feb 2022 15:24:34 +0100
Subject: [PATCH] Update the test suite run after installation
To test if the installation is correct and most importatnt complete
some test of the normal CI test suite are also executed after CbmRoot was
installed. Adjust this tests to the latest changes in the test suite.
---
macro/run/CMakeLists.txt | 2 +-
macro/run/config_ci.json | 2 +-
macro/run/run_tests.sh | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index d75435c142..88281aabeb 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -335,7 +335,7 @@ EndIf() # If(DEFINED ENV{RAW_DATA_PATH} )
# ============================================================================
Install(FILES .rootrc run_tra_file.C run_tra_beam.C run_transport_json_config.C run_digi_json_config.C config.json
- run_digi.C run_reco.C run_unpack_online.C run_unpack_tsa.C
+ run_digi.C run_reco.C run_unpack_online.C run_unpack_tsa.C config_ci.json
DESTINATION share/cbmroot/macro/run
)
Install(PROGRAMS run_tests.sh
diff --git a/macro/run/config_ci.json b/macro/run/config_ci.json
index bac0abc9ec..0c75e9bc98 100644
--- a/macro/run/config_ci.json
+++ b/macro/run/config_ci.json
@@ -107,7 +107,7 @@
],
"output": {
"path": "data/test_json",
- "overwrite": false
+ "overwrite": true
},
"geometry": {
"deactivate": ["", ""],
diff --git a/macro/run/run_tests.sh b/macro/run/run_tests.sh
index 9c0984e1da..cb3fb4f1bc 100644
--- a/macro/run/run_tests.sh
+++ b/macro/run/run_tests.sh
@@ -24,7 +24,7 @@ main () {
check_string="Macro finished successfully"
input=${VMCWORKDIR}/input/urqmd.auau.10gev.centr.root
- execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_coll\", \"${setup}\")" \
+ execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_coll\", \"${setup}\", kGeant3, 1, kTRUE)" \
$log_file_name \
$check_string
@@ -33,7 +33,7 @@ main () {
check_string="Macro finished successfully"
input=${VMCWORKDIR}/input/pluto.auau.8gev.omega.mpmm.0001.root
- execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_sign\", \"${setup}\")" \
+ execute_macro "run_tra_file.C(\"${input}\", ${nEvents}, \"data/${sname}_sign\", \"${setup}\", kGeant3, 1, kTRUE)" \
$log_file_name \
$check_string
@@ -41,14 +41,14 @@ main () {
log_file_name=data/run_tra_beam.log
check_string="Macro finished successfully"
- execute_macro "run_tra_beam.C(${nBeam}, \"Au\", 10, -1, \"data/${sname}_beam\", \"${setup}\")" \
+ execute_macro "run_tra_beam.C(${nBeam}, \"Au\", 10, -1, \"data/${sname}_beam\", \"${setup}\", kGeant3, 1, kTRUE)" \
$log_file_name \
$check_string
log_file_name=data/run_tra_json.log
check_string="Macro finished successfully"
- execute_macro "run_transport_json_config.C" \
+ execute_macro "run_transport_json_config.C(\"config_ci.json\")" \
$log_file_name \
$check_string
@@ -56,7 +56,7 @@ main () {
log_file_name=data/run_digi_json.log
check_string="Macro finished successfully"
- execute_macro "run_digi_json_config.C" \
+ execute_macro "run_digi_json_config.C(\"config_ci.json\")" \
$log_file_name \
$check_string
--
GitLab