From 690663a851b2596e865bd93f8f97727e06fe6dc5 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Tue, 28 May 2024 17:32:45 +0200 Subject: [PATCH 1/4] Test dependencies: fix test names --- Tests/CMakeLists.txt | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 0bf4f2b..f79b9c8 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -103,7 +103,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 + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim ) SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal" ) @@ -120,7 +120,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 + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim ) SET( test_name "test_${CLIC_DETECTOR_MODEL}_vtx_makentp" ) @@ -135,7 +135,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 + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim ) SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_real_overlay" ) @@ -155,7 +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 + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim REQUIRED_FILES ${EOS_BACKGROUND_FILE} ) @@ -263,7 +263,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds TIMEOUT 300000 ) @@ -284,7 +284,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds REQUIRED_FILES "${EOS_BACKGROUND_FILE}" TIMEOUT 300000 ) @@ -311,7 +311,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds TIMEOUT 300000 ) @@ -337,7 +337,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds REQUIRED_FILES ${EOS_BACKGROUND_FILE} TIMEOUT 300000 ) @@ -361,7 +361,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds TIMEOUT 300000 ) @@ -385,7 +385,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds REQUIRED_FILES ${EOS_BACKGROUND_FILE} TIMEOUT 300000 ) @@ -408,7 +408,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds TIMEOUT 300000 ) @@ -432,7 +432,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_zuds + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim_zuds REQUIRED_FILES ${EOS_BACKGROUND_FILE} TIMEOUT 300000 ) @@ -448,7 +448,6 @@ ADD_TEST( NAME t_${test_name} ) 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" ) @@ -466,7 +465,7 @@ ADD_TEST( NAME t_${test_name} ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" - DEPENDS test_${FCCee_DETECTOR_MODEL}_sim + DEPENDS t_test_${FCCee_DETECTOR_MODEL}_sim ) SET( test_name "test_${FCCee_DETECTOR_MODEL}_reco_conformal" ) @@ -483,5 +482,5 @@ ADD_TEST( NAME t_${test_name} ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" - DEPENDS test_${FCCee_DETECTOR_MODEL}_sim + DEPENDS t_test_${FCCee_DETECTOR_MODEL}_sim ) From 1c42afcecaa251c5729fa819c0ea0d6ec271549c Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Wed, 29 May 2024 10:18:35 +0200 Subject: [PATCH 2/4] CI: update actions --- .github/workflows/key4hep.yml | 4 ++-- .github/workflows/linux.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml index 4bc1bf5..a67df2d 100644 --- a/.github/workflows/key4hep.yml +++ b/.github/workflows/key4hep.yml @@ -8,8 +8,8 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v3 - - uses: cvmfs-contrib/github-action-cvmfs@v3 + - uses: actions/checkout@v4 + - uses: cvmfs-contrib/github-action-cvmfs@v4 - uses: aidasoft/run-lcg-view@v4 with: container: centos7 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fa9a38a..26a5d38 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cvmfs-contrib/github-action-cvmfs@v3 + - uses: cvmfs-contrib/github-action-cvmfs@v4 - uses: aidasoft/run-lcg-view@v4 with: view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/${{ matrix.LCG }}/nightly/x86_64-centos7-${{ matrix.COMPILER }}-opt" From 205c7c57eaa0178683626bd628675d56076da362 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Wed, 29 May 2024 10:19:03 +0200 Subject: [PATCH 3/4] CI: disable tests in key4hep build. run_k4geo_test cannot be found --- .github/workflows/key4hep.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml index a67df2d..f2a1e8a 100644 --- a/.github/workflows/key4hep.yml +++ b/.github/workflows/key4hep.yml @@ -25,7 +25,3 @@ jobs: .. echo "::endgroup::" && echo "::group::Build" ninja -k0 - echo "::endgroup::" && echo "::group::Install" - ninja install - echo "::endgroup::" && echo "::group::Run Tests" - ctest --output-on-failure From 41bfe8e8cbd2d3895e21ccfd257dced8064c2f20 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Wed, 29 May 2024 10:41:53 +0200 Subject: [PATCH 4/4] Tests: fix test dependency for vtx_mkntuple --- Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index f79b9c8..6211527 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -135,7 +135,7 @@ ADD_TEST( NAME t_${test_name} ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;\\[ ERROR;Error" - DEPENDS t_test_${CLIC_DETECTOR_MODEL}_sim + DEPENDS t_test_${CLIC_DETECTOR_MODEL}_reco_conformal ) SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_real_overlay" )