Tests: add more test dependencies

iLCSoft · May 14, 2024 · 9e6555d · 9e6555d
1 parent 88b8d7f
commit 9e6555d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -22,4 +22,5 @@ jobs:
           cd build
           cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " ..
           ninja -k0
+          ninja install
           ctest --output-on-failure -j 2
diff --git 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}
 )