Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test dependencies: fix test names #140

Merged
merged 4 commits into from
May 29, 2024
Merged

Test dependencies: fix test names #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
690663a
Test dependencies: fix test names
andresailer May 28, 2024
1c42afc
CI: update actions
andresailer May 29, 2024
205c7c5
CI: disable tests in key4hep build. run_k4geo_test cannot be found
andresailer May 29, 2024
41bfe8e
Tests: fix test dependency for vtx_mkntuple
andresailer May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/key4hep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
29 changes: 14 additions & 15 deletions Tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand All @@ -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" )
Expand All @@ -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}_reco_conformal
)

SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_real_overlay" )
Expand All @@ -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}
)

Expand Down Expand Up @@ -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
)

Expand All @@ -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
)
Expand All @@ -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
)

Expand All @@ -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
)
Expand All @@ -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
)

Expand All @@ -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
)
Expand All @@ -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
)

Expand All @@ -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
)
Expand All @@ -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" )
Expand All @@ -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" )
Expand All @@ -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
)