From bac3ee936986ecc15566212a07f6a823a53c578c Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Fri, 30 May 2025 10:56:27 +0200 Subject: [PATCH 1/2] Adapt for gaudi/Gaudi!1632 --- Hlt/Moore/python/Moore/tests/test_lines.py | 2 +- Hlt/Moore/tests/options/minimal_options.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Hlt/Moore/python/Moore/tests/test_lines.py b/Hlt/Moore/python/Moore/tests/test_lines.py index a71d18a13c5..b500ccaae25 100644 --- a/Hlt/Moore/python/Moore/tests/test_lines.py +++ b/Hlt/Moore/python/Moore/tests/test_lines.py @@ -13,7 +13,7 @@ from Moore import options from Moore.lines import Hlt2Line from Moore.persistence.particle_moving import particle_output -from PyConf.Algorithms import Gaudi__Examples__IntDataProducer as IntDataProducer +from PyConf.Algorithms import Gaudi__TestSuite__IntDataProducer as IntDataProducer from PyConf.application import configure_input from PyConf.packing import persistreco_version diff --git a/Hlt/Moore/tests/options/minimal_options.py b/Hlt/Moore/tests/options/minimal_options.py index bb5fcff7000..87b6262e4d0 100644 --- a/Hlt/Moore/tests/options/minimal_options.py +++ b/Hlt/Moore/tests/options/minimal_options.py @@ -20,7 +20,7 @@ This comprises from Moore import options, run_moore from Moore.lines import Hlt1Line -from PyConf.Algorithms import Gaudi__Examples__IntDataProducer as IntDataProducer +from PyConf.Algorithms import Gaudi__TestSuite__IntDataProducer as IntDataProducer def lines(): -- GitLab From 446f93c0e163c4d40ab9d0d22a90f5345b9f41a3 Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Fri, 30 May 2025 14:20:47 +0200 Subject: [PATCH 2/2] Fix small mistake in lhcb/Moore!4744 During refactoring, preparing lhcb/Moore!4744, I missed a bit of string that had to be removed --- Hlt/Hlt2Conf/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/CMakeLists.txt b/Hlt/Hlt2Conf/CMakeLists.txt index ddb6f7570f3..ab88127e20c 100644 --- a/Hlt/Hlt2Conf/CMakeLists.txt +++ b/Hlt/Hlt2Conf/CMakeLists.txt @@ -17,7 +17,7 @@ gaudi_install(PYTHON) gaudi_add_tests(pytest ${CMAKE_CURRENT_SOURCE_DIR}/python) foreach(tgt IN ITEMS Gaudi_MergeConfdb LHCb_MergeConfdb Lbcom_MergeConfdb Rec_MergeConfdb Allen_MergeConfdb GaudiKernelDict GaudiPythonDict DAQEventDict) - if(TARGET ${tgt}_MergeConfdb) + if(TARGET ${tgt}) add_dependencies(pytest-prefetch-Hlt2Conf-Hlt2Conf.pytest.python ${tgt}) endif() endforeach() -- GitLab