diff --git a/Hlt/Hlt1Conf/CMakeLists.txt b/Hlt/Hlt1Conf/CMakeLists.txt
index 7f967edfcb97a39222d04a86a6ff2f2efdfc2a4f..8758aa2986de5612d3d7bd40a5daf5a0231f7eb7 100644
--- a/Hlt/Hlt1Conf/CMakeLists.txt
+++ b/Hlt/Hlt1Conf/CMakeLists.txt
@@ -25,12 +25,22 @@ if(BUILD_TESTING AND USE_DD4HEP)
# Disable some tests that are not yet dd4hep ready
set_property(
TEST
+ # These need muon geometry v2
+ Hlt1Conf.hlt1_test_allen_muontables_v2geometry
Hlt1Conf.performance.pp_comparison
Hlt1Conf.performance.pp_default
- Hlt1Conf.performance.pp_track_mva
- Hlt1Conf.test_hlt1_dump_tracks
+ Hlt1Conf.persistency.dst_read
+ Hlt1Conf.persistency.dst_write
+ Hlt1Conf.persistency.mdf_read
+ Hlt1Conf.persistency.mdf_write
+ Hlt1Conf.persistency.selreports
Hlt1Conf.test_hlt1_example
Hlt1Conf.test_hlt1_smog_example
+ # other reasons
+ Hlt1Conf.performance.pp_comparison
+ Hlt1Conf.performance.pp_default
+ Hlt1Conf.performance.pp_track_mva
+ Hlt1Conf.test_hlt1_dump_tracks
PROPERTY
DISABLED TRUE
)
diff --git a/Hlt/Hlt2Conf/CMakeLists.txt b/Hlt/Hlt2Conf/CMakeLists.txt
index 6dc2081fe1b51406da29b248e61cb15487fdec73..f284608ea0ceced85fbc7b6bd36d93e5f1c53b10 100644
--- a/Hlt/Hlt2Conf/CMakeLists.txt
+++ b/Hlt/Hlt2Conf/CMakeLists.txt
@@ -50,6 +50,42 @@ if(BUILD_TESTING AND USE_DD4HEP)
# Disable some tests that are not yet dd4hep ready
set_property(
TEST
+ # These need muon geometry v2 or depend on tests needing it
+ Hlt2Conf.streaming.test_hlt2_streaming
+ Hlt2Conf.streaming.test_hlt2_streaming_check_A
+ Hlt2Conf.streaming.test_hlt2_streaming_check_B
+ Hlt2Conf.streaming.test_sprucing_streaming
+ Hlt2Conf.streaming.test_sprucing_streaming_check_A
+ Hlt2Conf.streaming.test_sprucing_streaming_check_B
+ Hlt2Conf.test_hlt2_2or3bodytopo_realtime
+ Hlt2Conf.test_hlt2_2or3bodytopo_realtime_dst
+ Hlt2Conf.test_hlt2_all_lines
+ Hlt2Conf.test_hlt2_bandwidth_5streams
+ Hlt2Conf.test_hlt2_flavourtagging_flavourtaggers
+ Hlt2Conf.test_hlt2_flavourtagging_sskaontagger
+ Hlt2Conf.test_hlt2_line_example_with_extras
+ Hlt2Conf.test_hlt2_noUT_trackefflines
+ Hlt2Conf.test_hlt2_passthrough_persistreco
+ Hlt2Conf.test_hlt2_trackefflines
+ Hlt2Conf.test_hlt2_with_hlt1_decisions
+ Hlt2Conf.test_persistreco_rawbanksp_mdf_fromfile
+ Hlt2Conf.test_persistreco_realtime
+ Hlt2Conf.sprucing.test_spruce_example_realtime
+ Hlt2Conf.sprucing.test_spruce_example_realtime_dstinput
+ Hlt2Conf.sprucing.test_spruce_example_realtime_dstinput_gaudirun
+ Hlt2Conf.sprucing.test_spruce_example_realtime_extraoutputs
+ Hlt2Conf.sprucing.test_spruce_example_realtime_gaudirun
+ Hlt2Conf.sprucing.test_spruce_example_realtime_monitoring
+ Hlt2Conf.sprucing.test_spruce_example_realtime_persistreco
+ Hlt2Conf.sprucing.test_spruce_hlt2filter
+ Hlt2Conf.sprucing.test_spruce_passthrough
+ Hlt2Conf.sprucing.test_spruce_passthrough_dstinput
+ Hlt2Conf.sprucing.test_spruce_passthrough_dstinput_check
+ Hlt2Conf.sprucing.test_spruce_passthrough_dstinput_gaudirun
+ Hlt2Conf.sprucing.test_spruce_passthrough_dstinput_gaudirun_check
+ Hlt2Conf.sprucing.test_spruce_passthrough_gaudirun
+ Hlt2Conf.sprucing.test_spruce_passthrough_gaudirun_check
+ # other reasons
Hlt2Conf.hlt2_pp_thor
Hlt2Conf.monitoring.test_hlt2_default_monitoring
Hlt2Conf.streaming.test_hlt2_all_lines_with_reco_with_streams
@@ -58,7 +94,6 @@ if(BUILD_TESTING AND USE_DD4HEP)
Hlt2Conf.test_hlt2_all_lines_with_reco
Hlt2Conf.test_hlt2_reco_plus_thor_selections_fastest
Hlt2Conf.test_hlt2_reco_plus_thor_selections_legacy
- Hlt2Conf.test_hlt2_trackefflines
PROPERTY
DISABLED TRUE
)
diff --git a/Hlt/RecoConf/CMakeLists.txt b/Hlt/RecoConf/CMakeLists.txt
index a7a0a419bce192852b8751a9c19c21e30cc6486b..5ef4983d5b44d85859551daa3e5c4803e715f280 100644
--- a/Hlt/RecoConf/CMakeLists.txt
+++ b/Hlt/RecoConf/CMakeLists.txt
@@ -32,31 +32,38 @@ if(BUILD_TESTING AND USE_DD4HEP)
# Disable some tests that are not yet dd4hep ready
set_property(
TEST
+ # These need muon geometry v2
RecoConf.decoding.compare_hlt1_hlt2_muon_decoding_v2geometry
+ RecoConf.examples.hlt2_reco_test_ldst_input
+ RecoConf.hlt1_reco_baseline_with_mcchecking
+ RecoConf.hlt1_reco_baseline_with_mcchecking_FTv6
+ RecoConf.hlt1_reco_decode_retina_with_mcchecking_FTv6
+ RecoConf.hlt2_lead_lead_light_reco_pr_kf
+ RecoConf.hlt2_lead_lead_light_reco_pr_kf_with_mcchecking
+ RecoConf.hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking
+ RecoConf.hlt2_pr_kf_longmuon
+ RecoConf.hlt2_protoparticles_baseline
+ RecoConf.hlt2_protoparticles_fastest
+ RecoConf.hlt2_reco_baseline_UTTELL40_with_mcchecking
+ RecoConf.hlt2_reco_baseline_with_mcchecking_MagUp
+ RecoConf.performance.hlt1_reco_muonIDeff
+ # Other reasons
RecoConf.decoding.compare_hlt1_hlt2_ut_decoding_with_mcchecking
RecoConf.decoding.compare_hlt1_hlt2_ut_decoding_with_mcchecking_v4r2
RecoConf.examples.hlt2_reco_tracking
RecoConf.allen_gaudi_velo_ut_with_mcchecking
- RecoConf.hlt1_reco_baseline_with_mcchecking
- RecoConf.hlt1_reco_baseline_with_mcchecking_FTv6
RecoConf.hlt2_fast_reco
RecoConf.hlt2_fast_reco_with_mcchecking
RecoConf.hlt2_fastest_reco_with_mcchecking
- RecoConf.hlt2_lead_lead_light_reco_pr_kf
- RecoConf.hlt2_lead_lead_light_reco_pr_kf_with_mcchecking
RecoConf.hlt2_light_reco_pr_kf_with_mcchecking
RecoConf.hlt2_light_reco_tracking
RecoConf.hlt2_light_reco_with_mcchecking
RecoConf.hlt2_light_reco_without_UT_with_mcchecking
RecoConf.hlt2_particles_baseline
- RecoConf.hlt2_protoparticles_baseline
- RecoConf.hlt2_protoparticles_fastest
RecoConf.hlt2_protoparticles_ttrack_baseline
RecoConf.hlt2_reco_baseline
- RecoConf.hlt2_reco_baseline_UTTELL40_with_mcchecking
RecoConf.hlt2_reco_baseline_multi_threaded
RecoConf.hlt2_reco_baseline_with_mcchecking
- RecoConf.hlt2_reco_baseline_with_mcchecking_MagUp
RecoConf.hlt2_reco_baseline_with_mcchecking_mpp_with_bfield
RecoConf.hlt2_reco_baseline_with_mcchecking_no_gec
RecoConf.hlt2_reco_baseline_with_monitoring
@@ -64,7 +71,6 @@ if(BUILD_TESTING AND USE_DD4HEP)
RecoConf.hlt2_reco_upstream_particles_low_momentum
RecoConf.hlt2_ut_filtered_forward_track_reco_with_mcchecking
RecoConf.performance.hlt1_reco_IPresolution
- RecoConf.performance.hlt1_reco_muonIDeff
RecoConf.performance.hlt1_reco_trackresolution
PROPERTY
DISABLED TRUE