From f52db591ba952eb60f61d2461cc27ddc46f852cb Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Thu, 22 Jan 2026 10:35:49 -0600 Subject: [PATCH 1/2] Replaced the relative path to the daqsystemtest/example-configs.data.xml file in the integration test with a path based on the DAQSYSTEMTEST_SHARE environmental variable. --- integtest/crt_reader_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integtest/crt_reader_test.py b/integtest/crt_reader_test.py index 0297d65..82dec7e 100644 --- a/integtest/crt_reader_test.py +++ b/integtest/crt_reader_test.py @@ -28,7 +28,7 @@ common_config_obj.dro_map_config.n_streams = number_of_data_producers common_config_obj.dro_map_config.n_apps = number_of_readout_apps common_config_obj.config_db = ( - os.path.dirname(__file__) + "/../../daqsystemtest/config/daqsystemtest/example-configs.data.xml" + os.environ.get("DAQSYSTEMTEST_SHARE") + "/config/daqsystemtest/example-configs.data.xml" ) onebyone_local_crt_bern_conf = copy.deepcopy(common_config_obj) From 8e4bb3487be317d4d9bfe5f835584cc638e69c43 Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Thu, 22 Jan 2026 11:21:26 -0600 Subject: [PATCH 2/2] Added a comment to the integtest to explain the use of the DAQSYSTEMTEST_SHARE env var in the location of the example-configs.data.xml file. --- integtest/crt_reader_test.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integtest/crt_reader_test.py b/integtest/crt_reader_test.py index 82dec7e..6d1d033 100644 --- a/integtest/crt_reader_test.py +++ b/integtest/crt_reader_test.py @@ -27,6 +27,12 @@ common_config_obj = data_classes.drunc_config() common_config_obj.dro_map_config.n_streams = number_of_data_producers common_config_obj.dro_map_config.n_apps = number_of_readout_apps +# 22-Jan-2026, KAB: added the use of the DAQSYSTEMTEST_SHARE env var as part of +# specifying the location of the example-configs.data.xml file. This is more +# reliable than using a relative path to a parallel directory with the daqsystemtest +# code in it. Of course, this new model has the feature that users will need to +# rebuild their software area if they make changes to the configuration entities +# in a local copy of the daqsystemtest repo before this code will see those changes. common_config_obj.config_db = ( os.environ.get("DAQSYSTEMTEST_SHARE") + "/config/daqsystemtest/example-configs.data.xml" )