Remove commented statements still using the old variable

macro/C2F/CMakeLists.txt

@@ -19,12 +19,9 @@ else()
   Set(NumEvents 20)
 endif()
 
-# Define the different setups to be tested
-#If( ${CBM_TEST_MODEL} MATCHES Nightly OR ${CBM_TEST_MODEL} MATCHES Weekly )
-  List(APPEND cbm_setup sis100_electron)
-#EndIf()
+List(APPEND cbm_setup sis100_electron)
 
-  ForEach(setup IN LISTS cbm_setup)
+ForEach(setup IN LISTS cbm_setup)
 
     # The test dependencies are set such that parallel execution is prevented, even is there is no logical
     # dependence. The reason is that all runs (for a given setup) use the same ROOT parameter file,
@@ -92,8 +89,8 @@ endif()
     )
 
 
-  EndForEach(setup IN LISTS cbm_setup)
-  # end of test CBM setups from geometry/setup
+EndForEach(setup IN LISTS cbm_setup)
+# end of test CBM setups from geometry/setup
 
 # Installation of macros is done in macro/CMakeLists.txt to install the
 # macros even if the tests are not executed

macro/dimuon/CMakeLists.txt

@@ -15,10 +15,9 @@ File(COPY ${CBMROOT_SOURCE_DIR}/parameters/much/TOF8gev_fitParam_sigma2.sis100_m
 Set(NumEvents 1000)
 
 # Define the different setups to be tested
-#If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) )
-  List(APPEND cbm_setup sis100_muon_lmvm)
+List(APPEND cbm_setup sis100_muon_lmvm)
 
-  ForEach(setup IN LISTS cbm_setup)
+ForEach(setup IN LISTS cbm_setup)
 
     # The test dependencies are set such that parallel execution is prevented, even is there is no logical
     # dependence. The reason is that all runs (for a given setup) use the same ROOT parameter file,
@@ -68,9 +67,8 @@ Set(NumEvents 1000)
     Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
     set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_dimuon_mass})
   
-  EndForEach(setup IN LISTS cbm_setup)
-  # end of test CBM setups from geometry/setup
-#EndIf()
+EndForEach(setup IN LISTS cbm_setup)
+# end of test CBM setups from geometry/setup
 
 # Installation of macros is done in macro/CMakeLists.txt to install the
 # macros even if the tests are not executed

macro/mcbm/CMakeLists.txt

@@ -113,13 +113,13 @@ ForEach(setup IN LISTS cbm_setup)
   Set(fixture_overlap fixture_overlap_${setup})
   set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_overlap})
 
-#  If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) )
+  If(NOT ${CBM_TEST_MODEL} MATCHES Experimental)
     Set(testname mcbm_check_media_${setup})
     Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/check_media.sh \"data/${setup}_test\")
     Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "60")
     Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
     set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_overlap})
-#  EndIf()
+  EndIf()
 
 EndForEach(setup IN LISTS cbm_setup)