Merge branch 'pkoppenb-87' into 'master'

Use env variable to address issue #87

Closes #87

See merge request !798

DaVinciExamples/tests/qmtest/debugging.qms/test_example-PrintDecayTree.qmt

@@ -12,7 +12,7 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
 <argument name="program"><text>lbexec</text></argument>
-<argument name="test_file_db_options_yaml"><text>Upgrade_Bd2KstarMuMu</text></argument>
+  <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml</text></argument>
 <argument name="extra_options_yaml"><text>
   evt_max: 100
   print_freq: 1
@@ -26,8 +26,8 @@
 <argument name="validator"><text>
 findReferenceBlock("""PrintJpsis                                 INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Candidates"                                    |        18 |         24 |     1.3333 |    0.57735 |      1.0000 |      3.0000 |
- | "Events"                                        |        18 |
+ | "Candidates"                                    |        21 |         24 |     1.1429 |    0.34993 |      1.0000 |      2.0000 |
+ | "Events"                                        |        21 |
 """, stdout, result, causes, signature_offset = 0)
 countErrorLines({"FATAL":0, "ERROR":0})
 <argument name="exit_code"><integer>1</integer></argument>

DaVinciExamples/tests/qmtest/debugging.qms/test_example-PrintHeader.qmt

@@ -12,7 +12,7 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
 <argument name="program"><text>lbexec</text></argument>
-<argument name="test_file_db_options_yaml"><text>Upgrade_Bd2KstarMuMu</text></argument>
+  <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml</text></argument>
 <argument name="extra_options_yaml"><text>
   evt_max: 7
   input_raw_format: 4.3

DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic.qmt

 <?xml version="1.0" ?>
 <!--
-    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
+###############################################################################
+# (c) Copyright 2020-2021 CERN for the benefit of the LHCb Collaboration      #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
 -->
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
-<argument name="program"><text>lbexec</text></argument>
-<argument name="timeout"><integer>3600</integer></argument>
-<argument name="test_file_db_options_yaml"><text>Upgrade_Bd2KstarMuMu</text></argument>
-<argument name="extra_options_yaml"><text>
-    control_flow_file: control_flow.gv
-    data_flow_file: data_flow.gv
+  <argument name="program"><text>lbexec</text></argument>
+  <argument name="args"><set>
+    <text>DaVinciExamples.tupling.basic:main</text>
+  </set></argument>
+  <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml</text></argument>
+  <argument name="extra_options_yaml"><text>
     ntuple_file: DV-example-tupling-basic-ntp.root
     histo_file: DV-example-tupling-basic-his.root
     evt_max: 10
@@ -24,9 +26,6 @@
     input_process: Hlt2
 </text></argument>
 <argument name="timeout"><integer>3600</integer></argument>
-<argument name="args"><set>
-  <text>DaVinciExamples.tupling.basic:main</text>
-</set></argument>
 <argument name="validator"><text>
 findReferenceBlock("""
 RFileCnv                               INFO dumping contents of /NTUPLES/FILE1