From d18a7ae5720c1cd49c0278ef384d3a0a4cb289db Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 13 Oct 2022 14:32:00 +0200 Subject: [PATCH] Tests: use new models for FCCee and CLIC --- lcgeoTests/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lcgeoTests/CMakeLists.txt b/lcgeoTests/CMakeLists.txt index 07d5e34b0..405f18f77 100644 --- a/lcgeoTests/CMakeLists.txt +++ b/lcgeoTests/CMakeLists.txt @@ -44,14 +44,14 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml --runType=batch -G -N=1 --outputFile=testCLIC_o2_v04.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) -SET( test_name "test_CLIC_o3_v14" ) +SET( test_name "test_CLIC_o3_v15" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml --runType=batch -G -N=1 --outputFile=testCLIC_o3_v14.slcio ) + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml --runType=batch -G -N=1 --outputFile=testCLIC_o3_v15.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) -SET( test_name "test_FCCee_o1_v04" ) +SET( test_name "test_FCCee_o1_v05" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o1_v04/FCCee_o1_v04.xml --runType=batch -G -N=1 --outputFile=testFCCee_o1_v04.slcio ) + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o1_v05/FCCee_o1_v05.xml --runType=batch -G -N=1 --outputFile=testFCCee_o1_v05.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) SET( test_name "test_FCCee_dev" ) @@ -59,9 +59,9 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_dev/FCCee_dev.xml --runType=batch -G -N=1 --outputFile=testFCCee_dev.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) -SET( test_name "test_FCCee_o2_v01" ) +SET( test_name "test_FCCee_o2_v02" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o2_v01/FCCee_o2_v01.xml --runType=batch -G -N=1 --outputFile=testFCCee_o2_v01.slcio ) + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/compact/FCCee_o2_v02/FCCee_o2_v02.xml --runType=batch -G -N=1 --outputFile=testFCCee_o2_v02.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) SET( test_name "test_steeringFile" ) @@ -81,5 +81,5 @@ INSTALL( TARGETS BeamCalZtest DESTINATION bin ) ADD_TEST( t_SensThickness_Clic_o2_v4 "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" ${CMAKE_INSTALL_PREFIX}/bin/TestSensThickness ${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml 300 50 ) -ADD_TEST( t_SensThickness_CLIC_o3_v14 "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" - ${CMAKE_INSTALL_PREFIX}/bin/TestSensThickness ${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml 100 50 ) +ADD_TEST( t_SensThickness_CLIC_o3_v15 "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" + ${CMAKE_INSTALL_PREFIX}/bin/TestSensThickness ${CMAKE_CURRENT_SOURCE_DIR}/../CLIC/compact/CLIC_o3_v15/CLIC_o3_v15.xml 100 50 )