From bab1b822945545fa5e00c7648cc5f4dc03c355de Mon Sep 17 00:00:00 2001
From: Patrick Koppenburg <Patrick Koppenburg patrick.koppenburg@cern.ch>
Date: Tue, 18 Oct 2022 14:04:32 +0200
Subject: [PATCH 1/3] Move test
---
.../python/DaVinciExamples}/option_davinci_v2_composites.py | 0
.../tests/qmtest/tupling.qms}/test_davinci_v2_composites.qmt | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {DaVinciTests/python/DaVinciTests => DaVinciExamples/python/DaVinciExamples}/option_davinci_v2_composites.py (100%)
rename {DaVinciTests/tests/qmtest/davinci.qms => DaVinciExamples/tests/qmtest/tupling.qms}/test_davinci_v2_composites.qmt (100%)
diff --git a/DaVinciTests/python/DaVinciTests/option_davinci_v2_composites.py b/DaVinciExamples/python/DaVinciExamples/option_davinci_v2_composites.py
similarity index 100%
rename from DaVinciTests/python/DaVinciTests/option_davinci_v2_composites.py
rename to DaVinciExamples/python/DaVinciExamples/option_davinci_v2_composites.py
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_v2_composites.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
similarity index 100%
rename from DaVinciTests/tests/qmtest/davinci.qms/test_davinci_v2_composites.qmt
rename to DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
--
GitLab
From 000360ebe58c3d47aaefbe775b850c77cb123adc Mon Sep 17 00:00:00 2001
From: Patrick Koppenburg <Patrick Koppenburg patrick.koppenburg@cern.ch>
Date: Tue, 18 Oct 2022 14:05:54 +0200
Subject: [PATCH 2/3] Rename package
---
.../tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
index a03575b2d..2c5c294a2 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
@@ -15,7 +15,7 @@
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="program"><text>lbexec</text></argument>
<argument name="args"><set>
- <text>DaVinciTests.option_davinci_v2_composites:main</text>
+ <text>DaVinciExamples.option_davinci_v2_composites:main</text>
</set></argument>
<argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/FEST_November_2021_dst_newPacking.yaml</text></argument>
<argument name="extra_options_yaml"><text>
@@ -24,7 +24,7 @@
<argument name="reference"><text>../refs/test_davinci_v2_composites.ref</text></argument>
<argument name="error_reference"><text>../refs/empty.ref</text></argument>
<argument name="validator"><text>
-#from DaVinciTests.QMTest.DaVinciExclusions import preprocessor, counter_preprocessor
+#from DaVinciExamples.QMTest.DaVinciExclusions import preprocessor, counter_preprocessor
#validateWithReference(preproc = preprocessor, counter_preproc = counter_preprocessor)
import sys, os, glob
from ROOT import TFile
--
GitLab
From ca9e5bf6edc7fb2713f42744057b791f7219951f Mon Sep 17 00:00:00 2001
From: Patrick Koppenburg <Patrick Koppenburg patrick.koppenburg@cern.ch>
Date: Wed, 19 Oct 2022 10:50:15 +0200
Subject: [PATCH 3/3] Remove env variable
---
.../tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
index 2c5c294a2..b4e0c1a3f 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
@@ -17,7 +17,7 @@
<argument name="args"><set>
<text>DaVinciExamples.option_davinci_v2_composites:main</text>
</set></argument>
- <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/FEST_November_2021_dst_newPacking.yaml</text></argument>
+ <argument name="options_yaml_fn"><text>../../example_data/FEST_November_2021_dst_newPacking.yaml</text></argument>
<argument name="extra_options_yaml"><text>
evt_max: 2
</text></argument>
--
GitLab