diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 82fa6f5..fa9a38a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,11 +7,11 @@ jobs: strategy: fail-fast: false matrix: - COMPILER: [gcc10, clang11] - LCG: [100] + COMPILER: [gcc11] + LCG: [104] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: cvmfs-contrib/github-action-cvmfs@v3 - uses: aidasoft/run-lcg-view@v4 with: @@ -23,4 +23,4 @@ jobs: cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " .. ninja -k0 ninja install - ctest --output-on-failure + ctest --output-on-failure -j 2 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 30d8d9c..0bf4f2b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -101,8 +101,10 @@ ADD_TEST( NAME t_${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS TRUTH ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" ) - +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES + FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" + DEPENDS test_${CLIC_DETECTOR_MODEL}_sim +) SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal" ) ADD_TEST( NAME t_${test_name} @@ -116,7 +118,10 @@ ADD_TEST( NAME t_${test_name} --Output_DST.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_dst.slcio WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES + FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" + DEPENDS test_${CLIC_DETECTOR_MODEL}_sim +) SET( test_name "test_${CLIC_DETECTOR_MODEL}_vtx_makentp" ) ADD_TEST( NAME t_${test_name} @@ -128,7 +133,10 @@ ADD_TEST( NAME t_${test_name} vtx_makentp.xml WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../Flavour_tagging/ ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES + FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" + DEPENDS test_${CLIC_DETECTOR_MODEL}_sim +) SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_real_overlay" ) ADD_TEST( NAME t_${test_name} @@ -147,6 +155,7 @@ ADD_TEST( NAME t_${test_name} ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" + DEPENDS test_${CLIC_DETECTOR_MODEL}_sim REQUIRED_FILES ${EOS_BACKGROUND_FILE} ) @@ -437,7 +446,10 @@ ADD_TEST( NAME t_${test_name} --outputFile=test${FCCee_DETECTOR_MODEL}.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/fcc_steer.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/ ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES + FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" + DEPENDS test_${FCCee_DETECTOR_MODEL}_sim +) SET( test_name "test_${FCCee_DETECTOR_MODEL}_reco_truth" ) ADD_TEST( NAME t_${test_name} @@ -452,7 +464,10 @@ ADD_TEST( NAME t_${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/ CONFIGURATIONS TRUTH ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES + FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" + DEPENDS test_${FCCee_DETECTOR_MODEL}_sim +) SET( test_name "test_${FCCee_DETECTOR_MODEL}_reco_conformal" ) ADD_TEST( NAME t_${test_name} @@ -466,4 +481,7 @@ ADD_TEST( NAME t_${test_name} --Output_DST.LCIOOutputFile=reco_conformal_dst.slcio WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/ ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES + FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" + DEPENDS test_${FCCee_DETECTOR_MODEL}_sim +)