From 53c7762af37a1b148c817584dd846fa6f8c768ae Mon Sep 17 00:00:00 2001
From: Kurt Biery <biery@daq.fnal.gov>
Date: Wed, 29 Jul 2026 08:44:53 -0500
Subject: [PATCH 1/3] Added logic to the dunedaq_integtest_bundle.sh script to
 provide hints to the user when no tests are left after filtering based on the
 command-line options.

---
 scripts/dunedaq_integtest_bundle.sh | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/scripts/dunedaq_integtest_bundle.sh b/scripts/dunedaq_integtest_bundle.sh
index 53d9d0f..ee263d5 100755
--- a/scripts/dunedaq_integtest_bundle.sh
+++ b/scripts/dunedaq_integtest_bundle.sh
@@ -251,6 +251,44 @@ if [[ $random_subset_count -gt 0 ]]; then
     filtered_integtest_list=($(shuf -n "$random_subset_count" -e "${filtered_integtest_list[@]}"))
 fi
 
+# check if any tests remain; provide hints to the user if not
+if [[ ${#filtered_integtest_list[@]} -eq 0 ]]; then
+    matching_integtest_list=()
+    if  [[ "${requested_test_names}" != "" ]]; then
+        echo "...Looking for integtests..."
+        full_integtest_list=(`list_available_integtests.sh 2>/dev/null`)
+        for repo_test in "${full_integtest_list[@]}"; do
+            test_name=`basename ${repo_test}`
+            match_string=`echo ${test_name} | egrep ${requested_test_names}`
+            if [[ "${match_string}" != "" ]]; then
+                matching_integtest_list+=(${repo_test})
+            fi
+        done
+    fi
+    echo ""
+    echo "*** No integtests were found that matched the specified command-line options."
+    if [[ ${#matching_integtest_list[@]} -gt 0 ]]; then
+        sleep 1
+        repo_name=`dirname ${matching_integtest_list[0]}`
+        test_name=`basename ${matching_integtest_list[0]}`
+        echo ""
+        echo "*** Consider adding '-r ${repo_name}' to the option list to pick up the '${test_name}' test."
+        if [[ ${#matching_integtest_list[@]} -gt 1 ]]; then
+            for match in "${matching_integtest_list[@]:1}"; do
+                repo_name=`dirname ${match}`
+                test_name=`basename ${match}`
+                echo "*** And/or '-r ${repo_name}' to pick up the '${test_name}' test."
+            done
+            echo "*** Or '-r all' to pick up all of these tests."
+        fi
+    fi
+    sleep 1
+    echo ""
+    echo "*** 'list_available_integtests.sh' will list all available tests."
+    echo ""
+    exit 5
+fi
+
 if [[ "$only_list_tests" != "" ]]; then
     let idx=0
     echo ""

From 6bfe86cd6286fcb9d287b4f9f4f073f70ee5ed51 Mon Sep 17 00:00:00 2001
From: Kurt Biery <biery@daq.fnal.gov>
Date: Wed, 29 Jul 2026 12:00:23 -0500
Subject: [PATCH 2/3] Updated the list of available pytest options in the
 bundle script help text.

---
 scripts/dunedaq_integtest_bundle.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/dunedaq_integtest_bundle.sh b/scripts/dunedaq_integtest_bundle.sh
index ee263d5..4b6ec88 100755
--- a/scripts/dunedaq_integtest_bundle.sh
+++ b/scripts/dunedaq_integtest_bundle.sh
@@ -37,11 +37,12 @@ Options:
          --dunerc-path <path> : Path to DUNE run control. Default is to search in \$PATH
          --skip-resource-checks : Whether to skip the node resource (CPU/Memory) checks for this test
          --process-manager-type <type> : The run control process manager type to use for this test, e.g. ssh-standalone
+         --no-integtest-connsvc : Whether to disable the Connectivity Service for this test
+         --remove-hdf5-files <choice> : 'always' forces files to be removed, 'never' forces files to be kept
          --dunerc-option <option-name> <option-value> : Repeatable, run control arguments without leading dashes
              for example, --dunerc-option log-level debug
        - example: --pytest-options \"--skip-resource-checks --process-manager-type ssh-standalone --dunerc-option no-override-logs\"
 """
-}
 
 # 29-Dec-2025, KAB: Determine if a non-standard pytest tmpdir has been specified
 # in the linux shell environment in which this script is being run. We need to know

From c2ed6d56df7cbfcc140fdc3beae73dbd83f73a9a Mon Sep 17 00:00:00 2001
From: Kurt Biery <biery@daq.fnal.gov>
Date: Wed, 29 Jul 2026 12:05:50 -0500
Subject: [PATCH 3/3] put back missing curly brace

---
 scripts/dunedaq_integtest_bundle.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/dunedaq_integtest_bundle.sh b/scripts/dunedaq_integtest_bundle.sh
index 4b6ec88..3eca337 100755
--- a/scripts/dunedaq_integtest_bundle.sh
+++ b/scripts/dunedaq_integtest_bundle.sh
@@ -43,6 +43,7 @@ Options:
              for example, --dunerc-option log-level debug
        - example: --pytest-options \"--skip-resource-checks --process-manager-type ssh-standalone --dunerc-option no-override-logs\"
 """
+}
 
 # 29-Dec-2025, KAB: Determine if a non-standard pytest tmpdir has been specified
 # in the linux shell environment in which this script is being run. We need to know