Modifieds fixture names in macro/run/CMakeList.txt to make the dependences clearer. Refs #2228.

macro/run/CMakeLists.txt

@@ -79,7 +79,7 @@ foreach(setup IN LISTS cbm_setup)
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
   	FIXTURES_REQUIRED cleanup
-  	FIXTURES_SETUP "fixt_digi_ts_${setup};fixt_digi_ev_${setup}"
+  	FIXTURES_SETUP fixt_tra_coll_${setup}
   	RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -93,7 +93,7 @@ foreach(setup IN LISTS cbm_setup)
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
   	FIXTURES_REQUIRED cleanup
-  	FIXTURES_SETUP fixt_digi_ts_${setup}
+  	FIXTURES_SETUP fixt_tra_sign_${setup}
   	RESOURCE_LOCK signParDb_${setup}
   )
 
@@ -106,34 +106,10 @@ foreach(setup IN LISTS cbm_setup)
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
   	FIXTURES_REQUIRED cleanup
-  	FIXTURES_SETUP fixt_digi_ts_${setup}
+  	FIXTURES_SETUP fixt_tra_beam_${setup}
   	RESOURCE_LOCK beamParDb_${setup}
   )
 
-  # --- 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_digi_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_digi_json_config
-  	FIXTURES_SETUP fixt_reco_json_config
-  	RESOURCE_LOCK json_config_ParDb
-  )
-
   # --- Test run_digi_ev
   # --- Detector response simulation, event-by-event, using run_digi.C
   set(testname run_${sname}_digi_ev)
@@ -142,8 +118,8 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-	FIXTURES_REQUIRED fixt_digi_ev_${setup}
-  	FIXTURES_SETUP fixt_reco_ev_${setup}
+	FIXTURES_REQUIRED fixt_tra_coll_${setup}
+  	FIXTURES_SETUP fixt_digi_ev_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -159,8 +135,8 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
- 	FIXTURES_REQUIRED fixt_digi_ts_${setup}
-  	FIXTURES_SETUP fixt_reco_ts_${setup}
+ 	FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_tra_sign_${setup};fixt_tra_beam_${setup}"
+  	FIXTURES_SETUP fixt_digi_ts_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -173,7 +149,7 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-	FIXTURES_REQUIRED fixt_reco_ev_${setup}
+	FIXTURES_REQUIRED fixt_digi_ev_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -187,7 +163,7 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
     TIMEOUT ${timeOutTime}
     PASS_REGULAR_EXPRESSION "Macro finished successfully"
-    FIXTURES_REQUIRED fixt_reco_ev_${setup}
+    FIXTURES_REQUIRED fixt_digi_ev_${setup}
     RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -201,7 +177,7 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-	FIXTURES_REQUIRED fixt_reco_ts_${setup}
+	FIXTURES_REQUIRED fixt_digi_ts_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -215,7 +191,7 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-	FIXTURES_REQUIRED fixt_reco_ts_${setup}
+	FIXTURES_REQUIRED fixt_digi_ts_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
@@ -228,13 +204,39 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-	FIXTURES_REQUIRED fixt_reco_ts_${setup}
+	FIXTURES_REQUIRED fixt_digi_ts_${setup}
  	RESOURCE_LOCK collParDb_${setup}
   )
 
+  # --- 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
+  )
+
+
 endforeach(setup IN LISTS cbm_setup)
 # ============================================================================
 
+
 # =====   mCBM 2021 tests   ==================================================
 # ====> only if test TSA files for "typical runs" present
 If(DEFINED ENV{RAW_DATA_PATH} )