diff --git a/external/InstallInput.cmake b/external/InstallInput.cmake index 7329b18f17d2e971c14185114f69b00abe98a08e..2c0cb228790d50953833c9ac5f8e194858a6bf20 100644 --- a/external/InstallInput.cmake +++ b/external/InstallInput.cmake @@ -1,4 +1,4 @@ -set(INPUT_VERSION 730acc5c3e6764fa72160312a516348372064611) +set(INPUT_VERSION ec989d78aca9ec58d90a242ff47f30e8141c3ff8) set(INPUT_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_input.git") diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt index 3b5c13838932d67092ad74b6457a919def30cc05..041afb1adcec104749cc80ea4e06742a1c1ed949 100644 --- a/macro/mcbm/CMakeLists.txt +++ b/macro/mcbm/CMakeLists.txt @@ -8,7 +8,6 @@ GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mcbm/mcbm_qa.C) #GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mcbm/mcbm_check_materials.C) Set(MACRO_DIR ${CMAKE_CURRENT_BINARY_DIR}) -GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/geometry/check_media.C ${MACRO_DIR}) # ============================================================================ # Put the .rootrc file into the directory from which root is executed. @@ -127,16 +126,6 @@ ForEach(setup IN LISTS cbm_setup) #Set(_FileName_Dependency data/mcbm_mc_${setup}_ok) #Set_Tests_Properties(${testname} PROPERTIES REQUIRED_FILES ${_FileName_Dependency}) - 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" - PASS_REGULAR_EXPRESSION "Test Passed;All ok" - FIXTURES_REQUIRED ${fixture_mcbm_qa_event_mc} - ) - EndIf() - EndForEach(setup IN LISTS cbm_setup) Install(FILES .rootrc mcbm_transport.C mcbm_digi.C mcbm_reco_event.C mcbm_match_check.C mcbm_hadron_analysis.C mcbm_qa.C diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt index 699b436cf197ac7cd28b0b3424fd1c59198fe594..e80f3b9dbed39358be6e0e9ffb13f08f8a702baa 100644 --- a/macro/run/CMakeLists.txt +++ b/macro/run/CMakeLists.txt @@ -9,7 +9,6 @@ GENERATE_EXE_SCRIPT(${CBMROOT_BINARY_DIR}/bin cbmreco_offline) Set(MACRO_DIR ${CMAKE_CURRENT_BINARY_DIR}) -GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/geometry/check_media.C ${MACRO_DIR}) # ============================================================================ @@ -100,16 +99,6 @@ foreach(setup IN LISTS cbm_setup) RESOURCE_LOCK collParDb_${setup} ) - set(testname run_check_media_${sname}) - add_test(${testname} ${MACRO_DIR}/check_media.sh \"data/${sname}_coll\") - set_tests_properties(${testname} PROPERTIES - TIMEOUT ${timeOutTime} - FAIL_REGULAR_EXPRESSION "segmentation violation" - PASS_REGULAR_EXPRESSION "Test Passed;All ok" - FIXTURES_REQUIRED fixt_tra_coll_${setup} - FIXTURES_SETUP fixt_check_media_${setup} - ) - # --- Test run_tra_sign # --- Transport run with signal events, using run_tra_file.C set(testname run_${sname}_tra_sign) @@ -148,7 +137,7 @@ foreach(setup IN LISTS cbm_setup) TIMEOUT ${timeOutTime} FAIL_REGULAR_EXPRESSION "segmentation violation" PASS_REGULAR_EXPRESSION "Macro finished successfully" - FIXTURES_REQUIRED fixt_check_media_${setup} + FIXTURES_REQUIRED fixt_tra_coll_${setup} FIXTURES_SETUP fixt_digi_ev_${setup} RESOURCE_LOCK collParDb_${setup} ) @@ -166,7 +155,7 @@ foreach(setup IN LISTS cbm_setup) TIMEOUT ${timeOutTime} FAIL_REGULAR_EXPRESSION "segmentation violation" PASS_REGULAR_EXPRESSION "Macro finished successfully" - FIXTURES_REQUIRED "fixt_check_media_${setup};fixt_tra_sign_${setup};fixt_tra_beam_${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} ) @@ -318,7 +307,7 @@ foreach(setup IN LISTS cbm_setup) TIMEOUT ${timeOutTime} FAIL_REGULAR_EXPRESSION "segmentation violation" PASS_REGULAR_EXPRESSION "Macro finished successfully" - FIXTURES_REQUIRED "fixt_check_media_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}" + FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}" FIXTURES_SETUP fixt_qa_${setup} RESOURCE_LOCK collParDb_${setup} )