From 0b8d2c8f88d4b5e20d07176e723e3b473907d131 Mon Sep 17 00:00:00 2001
From: Christoph Hasse <christoph.hasse@cern.ch>
Date: Tue, 29 Mar 2022 11:24:27 +0200
Subject: [PATCH] inherit default qmtest exclusions from Rec project
---
.../tests/refs/test_davinci_tupling-DTF-filtered.ref | 2 --
.../tests/refs/test_davinci_tupling-basic-run-mc.ref | 2 --
.../tests/refs/test_davinci_tupling_array_taggers.ref | 2 --
.../tests/refs/test_davinci_tupling_from_hlt2.ref | 2 --
.../refs/test_davinci_tupling_from_hlt2_gaudirun.ref | 2 --
.../tests/refs/test_davinci_tupling_from_xgen.ref | 2 --
.../python/DaVinciTests/QMTest/DaVinciExclusions.py | 9 ++++-----
7 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling-DTF-filtered.ref b/DaVinciExamples/tests/refs/test_davinci_tupling-DTF-filtered.ref
index b67569477..343780c88 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling-DTF-filtered.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling-DTF-filtered.ref
@@ -12,8 +12,6 @@ HistogramPersistencySvc INFO Added successfully Conversion servic
FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took n seconds
DeFTDetector INFO Current FT geometry version = 63
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
index f28a4ea19..7fff370d3 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
@@ -14,8 +14,6 @@ EventClockSvc.FakeEventTime INFO Event times generated from 0 with st
UnpackChargedProtos.ChargedProto... INFO Using retuned RICH el and mu DLL values in combined DLLs
FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took n seconds
DeFTDetector INFO Current FT geometry version = 63
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
index a3c646577..60a02b2a1 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
@@ -14,8 +14,6 @@ EventClockSvc.FakeEventTime INFO Event times generated from 0 with st
Unpacker_PackedChargedProtos.Cha... INFO Using retuned RICH el and mu DLL values in combined DLLs
FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took n seconds
DeFTDetector INFO Current FT geometry version = 63
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
index 57aad1278..2902e9cff 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
@@ -15,8 +15,6 @@ MCTruthAndBkgCatAlg#1.DaVinciSma... INFO Will look into [Relations/ChargedPP2
MCTruthAndBkgCatAlg#1.DaVinciSma... INFO Will look into [Relations/ChargedPP2MCP, Relations/NeutralPP2MCP]
MCTruthAndBkgCatAlg#1.Background... INFO Will look into [Relations/ChargedPP2MCP, Relations/NeutralPP2MCP]
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took n seconds
DeFTDetector INFO Current FT geometry version = 64
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2_gaudirun.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2_gaudirun.ref
index 97ea1587f..9d5f6819a 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2_gaudirun.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2_gaudirun.ref
@@ -13,8 +13,6 @@ RootHistSvc INFO Writing ROOT histograms to: tuple_D0
HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc
EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took n seconds
DeFTDetector INFO Current FT geometry version = 64
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_xgen.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_xgen.ref
index 6a9d0d03f..af7ad353e 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_xgen.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_xgen.ref
@@ -12,8 +12,6 @@ HistogramPersistencySvc INFO Added successfully Conversion servic
FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took n seconds
DeFTDetector INFO Current FT geometry version = 63
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
diff --git a/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py
index 52deab07a..0c9be31cd 100755
--- a/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py
+++ b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py
@@ -10,7 +10,7 @@
###############################################################################
from GaudiTest import LineSkipper
from GaudiConf.QMTest.LHCbTest import BlockSkipper
-from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
+from RecConf.QMTest.exclusions import preprocessor as RecPreprocessor
remove_uninteresting_lines = LineSkipper(regexps=[
r"IODataManager +ERROR Referring to existing dataset",
@@ -21,8 +21,8 @@ remove_uninteresting_lines = LineSkipper(regexps=[
r"(Memory for the event|Mean 'delta-memory') exceeds 3*sigma",
r"(AfterMagnet|Magnet|BeforeMagnet|Downstream)Region/.*",
r"(LHCBCOND_|SIMCOND|DDDB)_", r"DataOnDemandSvc +INFO Handled",
- r"HLTControlFlowMgr +INFO", r"FunctorFactory +INFO Reusing cling compiled",
- r"<module .*", "SUCCESS Exceptions/Errors/Warnings/Infos Statistics :",
+ r"HLTControlFlowMgr +INFO", r"<module .*",
+ "SUCCESS Exceptions/Errors/Warnings/Infos Statistics :",
"INFO MuonIDAlg v", "DaVinciInitAlg.DaVinciMemory",
"mc_unpackers' must run BEFORE 'unpackers'", "MD5 sum:"
])
@@ -43,7 +43,6 @@ remove_known_warnings = LineSkipper(regexps=[
"WARNING: MC tools not functional yet outside Hlt2 - .*",
# FunTuple warning for the update_counters: skipping event is no candidates are found
r"[a-zA-Z0-9]* +WARNING FunTupleBase<KeyedContainer<LHCb::MCParticle,Containers::KeyedObjectManager<Containers::hashmap> > >:: .*",
- r"FunctorFactory\s{1,}INFO Cache miss for functor: .*"
])
# Remove all DV options to avoid test failures due to LHCb changes.
@@ -53,4 +52,4 @@ remove_list_options = BlockSkipper(
"/***** User DVAppOptions/DVAppOptions",
"\\----- (End of User DVAppOptions/DVAppOptions)")
-preprocessor = LHCbPreprocessor + remove_uninteresting_lines + remove_list_options + remove_known_warnings
+preprocessor = RecPreprocessor + remove_uninteresting_lines + remove_list_options + remove_known_warnings
--
GitLab