From f1723e10d688e9bf3546a4a8963bb50f819141b5 Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Tue, 16 Jun 2026 14:23:04 -0500 Subject: [PATCH 1/2] Added a dunerc_cmd_args field to the integtest_param_base_class in data_classes.py to support developer-specified command-line arguments for run control in integtests. --- src/integrationtest/data_classes.py | 3 +++ src/integrationtest/integrationtest_drunc.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/integrationtest/data_classes.py b/src/integrationtest/data_classes.py index bf2bef1..0b1c195 100755 --- a/src/integrationtest/data_classes.py +++ b/src/integrationtest/data_classes.py @@ -67,6 +67,9 @@ class integtest_param_base_class: connsvc_port: int = 0 connsvc_debug_level: int = None + # command-line arguments to be passed to run control + dunerc_cmd_args: list[str] = field(default_factory=list) + @dataclass class integtest_params_for_generated_dunedaq_config(integtest_param_base_class): # *** Parameters that are needed for both generated and predefined configs, diff --git a/src/integrationtest/integrationtest_drunc.py b/src/integrationtest/integrationtest_drunc.py index f915d0e..3b5c43b 100755 --- a/src/integrationtest/integrationtest_drunc.py +++ b/src/integrationtest/integrationtest_drunc.py @@ -643,8 +643,9 @@ class RunResult: time_before = time.time() # 25-Mar-2026, KAB: use subprocess.Popen to manage the run control session so that we can # capture the console output and pass it back to the user for inspection and validation. - popen_command_list = [dunerc] + dunerc_option_strings + [process_manager_type] \ - + [str(create_config_files.config_file)] + [str(create_config_files.config.config_session_name)] \ + popen_command_list = [dunerc] + create_config_files.config.dunerc_cmd_args + dunerc_option_strings \ + + [process_manager_type] + [str(create_config_files.config_file)] \ + + [str(create_config_files.config.config_session_name)] \ + [str(create_config_files.config.daq_session_name)] + run_control_commands rc_process = subprocess.Popen( popen_command_list, From 38971f49a9fd7cf16f339201e6f26ec3f0d821e7 Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Mon, 6 Jul 2026 08:05:38 -0500 Subject: [PATCH 2/2] fixed merge error --- src/integrationtest/integrationtest_drunc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/integrationtest/integrationtest_drunc.py b/src/integrationtest/integrationtest_drunc.py index 82c178b..9813ff3 100755 --- a/src/integrationtest/integrationtest_drunc.py +++ b/src/integrationtest/integrationtest_drunc.py @@ -600,8 +600,8 @@ class RunResult: time_before = time.time() # 25-Mar-2026, KAB: use subprocess.Popen to manage the run control session so that we can # capture the console output and pass it back to the user for inspection and validation. - popen_command_list = [dunerc] + create_config_files.config.dunerc_cmd_args + dunerc_option_strings \ - + [process_manager_type] + [str(create_config_files.dunedaq_config_file)] \ + popen_command_list = [dunerc] + create_config_files.integtest_params.dunerc_cmd_args \ + + dunerc_option_strings + [process_manager_type] + [str(create_config_files.dunedaq_config_file)] \ + [str(create_config_files.integtest_params.config_session_name)] \ + [str(create_config_files.integtest_params.daq_session_name)] + run_control_commands rc_process = subprocess.Popen(