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

Jump to bottom

Tests: add test dependency for FCCee tests #139

Merged
merged 3 commits into from
May 14, 2024
Merged

Tests: add test dependency for FCCee tests #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76d315d
Tests: add test dependency for FCCee tests
andresailer May 14, 2024
02ab19f
CI: update stack
andresailer May 14, 2024
938f497
Tests: add more test dependencies
andresailer May 14, 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: 4 additions & 4 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
32 changes: 25 additions & 7 deletions Tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
)

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