From ac9d467746aff18d8083a804e65146f0614929c6 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Mon, 23 Feb 2026 13:57:01 -0600
Subject: [PATCH 01/22] Copy test_daq-buildtools.sh from daq-release

---
 scripts/test_daq-buildtools.sh | 130 +++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100755 scripts/test_daq-buildtools.sh

diff --git a/scripts/test_daq-buildtools.sh b/scripts/test_daq-buildtools.sh
new file mode 100755
index 0000000..372b1d1
--- /dev/null
+++ b/scripts/test_daq-buildtools.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+usage() {
+    local prog=$(basename "$0")
+    cat << EOF
+Usage: $prog [OPTIONS]
+
+Test functionality of daq-buildtools commands.
+
+Optional arguments:
+    --release <release_name>    Release in which to test daq-buildtools commands. [default: last_fddaq]
+    --dbt-branch <branch_name>  Branch of daq-buildtools to run tests from. [default: develop]
+    --repo <repo_name>          Name of a single repo to checkout for tests. [default: ipm]
+
+Example:
+    ./${prog} --release fddaq-v5.5.0-a9 --dbt-branch user/new_feature --repo hdf5libs
+EOF
+}
+
+start_dir="$PWD"
+
+cleanup() {
+    echo "Triggering cleanup"
+    cd "$start_dir"
+    rm -rf "$dbt_tmpdir"
+    rm -rf "$release_tmpdir"
+    echo "Done"
+}
+trap cleanup EXIT SIGINT SIGTERM
+
+release="last_fddaq"
+repo="ipm"
+dbt_branch="develop"
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+    -h|--help|-?)
+        usage
+        exit 1
+        ;;
+    --release)
+        release="$2"
+        shift 2
+        ;;
+    --repo)
+        repo="$2"
+        shift 2
+        ;;
+    --dbt-branch)
+        dbt_branch="$2"
+        shift 2
+        ;;
+    *)
+        echo "ERROR: Unknown argument: $1"
+        exit 1
+        ;;
+    esac
+done
+
+extra_args=()
+if [[ "$release" == *"FD_"* || "$release" == "last_fddaq" ]]; then
+    extra_args=(-n)
+elif [[ "$release" == *"rc"* ]]; then
+    extra_args=(-b candidate)
+fi
+
+echo -e "Running daq-buildtools commands using:\n"
+echo -e "\tRelease name: $release"
+echo -e "\tdbt branch:   $dbt_branch"
+echo -e "\trepo:         $repo\n"
+
+. /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh || exit 1
+setup_dbt latest_v5 || exit 2
+
+if [[ -n "dbt_branch" ]]; then
+    dbt_tmpdir=$(mktemp -d)
+    mkdir -p "$dbt_tmpdir" && cd "$dbt_tmpdir"
+    git clone https://github.com/DUNE-DAQ/daq-buildtools.git -b "$dbt_branch"
+    source daq-buildtools/env.sh
+fi
+
+release_tmpdir=$(mktemp -d)
+mkdir -p "$release_tmpdir" && cd "$release_tmpdir"
+
+echo "*********************************TEST dbt-setup-release *******************************"
+# Check that dbt-setup-release works without altering the environment, thus the (...)
+(dbt-setup-release "${extra_args[@]}" "$release"; echo $? > $release_tmpdir/dbt-setup-release_result.txt)
+
+test -e $release_tmpdir/dbt-setup-release_result.txt || exit 3
+test $( cat $release_tmpdir/dbt-setup-release_result.txt ) == 0 || exit 4
+rm -f dbt-setup-release_result.txt
+
+echo "*********************************TEST dbt-create ***************************************"
+dbt-create -s ${extra_args[@]} $release || exit 5
+cd $(ls)  # Only thing in the directory will be the work area
+cd sourcecode
+git clone https://github.com/DUNE-DAQ/$repo || exit 6
+cd ..
+. env.sh || exit 7
+
+echo "**********************************TEST dbt-build ****************************************"
+dbt-build || exit 8
+
+echo "******************************TEST dbt-build --lint *************************************"
+dbt-build --lint || exit 9
+
+echo "******************************TEST dbt-build --unittest *********************************"
+dbt-build --unittest || exit 10
+
+echo "******************************TEST dbt-clang-format.sh **********************************"
+cd $DBT_AREA_ROOT/sourcecode
+dbt-clang-format.sh $repo --view-differences-only || exit 11
+
+# Test building against a sourcecode directory outside of the work area
+echo "***********************TEST dbt-build with external sourcecode **************************"
+cd ..
+mv sourcecode $release_tmpdir
+ln -s $release_tmpdir/sourcecode
+dbt-build --clean || exit 12
+
+echo "*****************************TEST dbt-build --codegen **********************************"
+dbt-build --codegen || exit 13
+
+echo "********************TEST local workarea Spack package installation **********************"
+spack install py-wesanderson || exit 14
+
+echo "*********************************TEST dbt-lcov.sh****************************************"
+dbt-lcov.sh || exit 15
+
+exit 0

From 310566dbd6d45b6ad192315e1e464527d6dfc94a Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Mon, 23 Feb 2026 14:15:39 -0600
Subject: [PATCH 02/22] Add workflow to run test_daq-buildtools on PR

---
 .github/workflows/test_daq_buildtools.yml | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/test_daq_buildtools.yml

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
new file mode 100644
index 0000000..19cee00
--- /dev/null
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -0,0 +1,31 @@
+name: Test daq-buildtools
+
+on:
+  pull_request:
+    branches: develop
+    types: [opened, reopened, synchronize]
+
+jobs:
+  test_daq_buildtools:
+    name: Test daq-buildtools
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - id: checkout_daq_buildtools
+      uses: actions/checkout@v6
+      with:
+        path: daq-buildtools-test
+
+    - uses: cvmfs-contrib/github-action-cvmfs@v5
+      with:
+        cvmfs_repositories: 'dunedaq.opensciencegrid.org'
+
+    - name: Run test_daq-buildtools script
+      run: |
+        cd daq-buildtools-test
+        source env.sh
+        cd scripts
+        ./test_daq-buildtools.sh --dbt-branch ${{ github.head_ref }}
+        
\ No newline at end of file

From 5e5f119e375571093b4db588b5b8eb73a7532ae4 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Mon, 23 Feb 2026 14:23:10 -0600
Subject: [PATCH 03/22] Trigger test workflow on PR to this branch

---
 .github/workflows/test_daq_buildtools.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 19cee00..00412a2 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -2,7 +2,9 @@ name: Test daq-buildtools
 
 on:
   pull_request:
-    branches: develop
+    branches:
+      - develop
+      - amogan/test_daq_buildtools_workflow
     types: [opened, reopened, synchronize]
 
 jobs:
@@ -12,6 +14,7 @@ jobs:
     defaults:
       run:
         shell: bash
+
     steps:
     - id: checkout_daq_buildtools
       uses: actions/checkout@v6

From 7d09eca663a8f19abe6c9f638e0d1be7c66fc4bf Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Mon, 23 Feb 2026 14:40:23 -0600
Subject: [PATCH 04/22] Add whitespace

---
 .github/workflows/test_daq_buildtools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index e8ef2d3..e09580a 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -30,4 +30,4 @@ jobs:
         source env.sh
         cd scripts
         ./test_daq-buildtools.sh --dbt-branch ${{ github.head_ref }}
-        
\ No newline at end of file
+        

From 8cc9acbaacb718b21075049d6c08c1e0f6179988 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Mon, 23 Feb 2026 14:41:51 -0600
Subject: [PATCH 05/22] Add more whitespace

---
 .github/workflows/test_daq_buildtools.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index e09580a..d5bde65 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -31,3 +31,4 @@ jobs:
         cd scripts
         ./test_daq-buildtools.sh --dbt-branch ${{ github.head_ref }}
         
+

From 9bc10a0d7d70baa42eebe86d4b818277769f1faa Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Mon, 23 Feb 2026 15:12:10 -0600
Subject: [PATCH 06/22] Run on daq

---
 .github/workflows/test_daq_buildtools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index d5bde65..046edd5 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test_daq_buildtools:
     name: Test daq-buildtools
-    runs-on: ubuntu-latest
+    runs-on: daq
     defaults:
       run:
         shell: bash

From 4ae0c741f28604b84a339982b38769c5c6a74d44 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:15:24 -0600
Subject: [PATCH 07/22] Try almalinux9 container

---
 .github/workflows/test_daq_buildtools.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 046edd5..2097889 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -11,6 +11,8 @@ jobs:
   test_daq_buildtools:
     name: Test daq-buildtools
     runs-on: daq
+    container:
+      image: almalinux:9
     defaults:
       run:
         shell: bash

From 4fe261ec87a6cf0ae8891abb0f3b658c0263a411 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:16:19 -0600
Subject: [PATCH 08/22] Try almalinux9 container on ubuntu-latest

---
 .github/workflows/test_daq_buildtools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 2097889..7bb8748 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test_daq_buildtools:
     name: Test daq-buildtools
-    runs-on: daq
+    runs-on: ubuntu-latest
     container:
       image: almalinux:9
     defaults:

From 314bf972f5ac3cfd5b5601d7c6b7ecb67f5e6bb1 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:21:38 -0600
Subject: [PATCH 09/22] Try running in our al9 slim externals image

---
 .github/workflows/test_daq_buildtools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 7bb8748..199cd94 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -12,7 +12,7 @@ jobs:
     name: Test daq-buildtools
     runs-on: ubuntu-latest
     container:
-      image: almalinux:9
+      image: ghcr.io/dune-daq/alma9-slim-externals:v2.3
     defaults:
       run:
         shell: bash

From d759ace3cf15939d211d5a50bae4aef1b65b8ec9 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:25:40 -0600
Subject: [PATCH 10/22] Comment cvmfs-contrib step

---
 .github/workflows/test_daq_buildtools.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 199cd94..1bbb225 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -22,9 +22,9 @@ jobs:
       with:
         path: daq-buildtools-test
 
-    - uses: cvmfs-contrib/github-action-cvmfs@v5
-      with:
-        cvmfs_repositories: 'dunedaq.opensciencegrid.org'
+    #- uses: cvmfs-contrib/github-action-cvmfs@v5
+    #  with:
+    #    cvmfs_repositories: 'dunedaq.opensciencegrid.org'
 
     - name: Run test_daq-buildtools script
       run: |

From 9c4aefaec271f0527ae63952ade031f32796fbda Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:31:12 -0600
Subject: [PATCH 11/22] Try running in latest nightly build container

---
 .github/workflows/test_daq_buildtools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 1bbb225..439e060 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -12,7 +12,7 @@ jobs:
     name: Test daq-buildtools
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dune-daq/alma9-slim-externals:v2.3
+      image: ghcr.io/dune-daq/nightly-release-alma9:latest
     defaults:
       run:
         shell: bash

From 219c47ba541a8759e7b9ed36325b47071b4b26a9 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:37:19 -0600
Subject: [PATCH 12/22] Correct container tag

---
 .github/workflows/test_daq_buildtools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 439e060..fc5b273 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -12,7 +12,7 @@ jobs:
     name: Test daq-buildtools
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dune-daq/nightly-release-alma9:latest
+      image: ghcr.io/dune-daq/nightly-release-alma9:development_v5
     defaults:
       run:
         shell: bash

From 611d47897d5925a4b043b8c5db795fe187507533 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 09:58:34 -0600
Subject: [PATCH 13/22] Troubleshoot llvm package

---
 .github/workflows/test_daq_buildtools.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index fc5b273..f90bc0b 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -26,6 +26,15 @@ jobs:
     #  with:
     #    cvmfs_repositories: 'dunedaq.opensciencegrid.org'
 
+    - name: Troubleshoot llvm package
+      run: |
+        source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
+        setup_dbt latest
+        dbt-setup-release -n last_fddaq
+        spack find llvm
+        spack find --loaded llvm
+        spack list llvm
+
     - name: Run test_daq-buildtools script
       run: |
         cd daq-buildtools-test

From b01385db18398e9c1182235f3f3478a41808ad0e Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 13:19:50 -0600
Subject: [PATCH 14/22] Manually validate workflow actor

---
 .github/workflows/test_daq_buildtools.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index f90bc0b..33d20b3 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -16,16 +16,19 @@ jobs:
     defaults:
       run:
         shell: bash
+
     steps:
+    - name: Validate actor
+      run: |
+        if [[ "${{ github.actor }}" != "andrewmogan" && "${{ github.actor }}" != "jcfreeman" ]]; then
+          exit 1
+        fi
+
     - id: checkout_daq_buildtools
       uses: actions/checkout@v6
       with:
         path: daq-buildtools-test
 
-    #- uses: cvmfs-contrib/github-action-cvmfs@v5
-    #  with:
-    #    cvmfs_repositories: 'dunedaq.opensciencegrid.org'
-
     - name: Troubleshoot llvm package
       run: |
         source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh

From 859d7e264e6ffa16a3b99053cb8271c7a90903a2 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Tue, 24 Feb 2026 14:48:43 -0600
Subject: [PATCH 15/22] Only run dbt-build --lint if llvm is loaded

---
 scripts/test_daq-buildtools.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/test_daq-buildtools.sh b/scripts/test_daq-buildtools.sh
index 372b1d1..7a15ef8 100755
--- a/scripts/test_daq-buildtools.sh
+++ b/scripts/test_daq-buildtools.sh
@@ -102,7 +102,11 @@ echo "**********************************TEST dbt-build *************************
 dbt-build || exit 8
 
 echo "******************************TEST dbt-build --lint *************************************"
-dbt-build --lint || exit 9
+if spack find --loaded llvm >/dev/null 2>&1; then
+    dbt-build --lint || exit 9
+else
+    echo "WARNING: Skipping dbt-build --lint since llvm is not loaded"
+fi
 
 echo "******************************TEST dbt-build --unittest *********************************"
 dbt-build --unittest || exit 10

From c29f2b40bf82bd6636c5ad944bc6d319bdf6f66c Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Wed, 25 Feb 2026 10:49:06 -0600
Subject: [PATCH 16/22] Remove unnecessary steps

---
 .github/workflows/test_daq_buildtools.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index 33d20b3..e4393bc 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -1,10 +1,12 @@
 name: Test daq-buildtools
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     branches:
       - develop
-      - amogan/test_daq_buildtools_workflow
     types: [opened, reopened, synchronize]
 
 jobs:
@@ -18,25 +20,11 @@ jobs:
         shell: bash
 
     steps:
-    - name: Validate actor
-      run: |
-        if [[ "${{ github.actor }}" != "andrewmogan" && "${{ github.actor }}" != "jcfreeman" ]]; then
-          exit 1
-        fi
-
     - id: checkout_daq_buildtools
       uses: actions/checkout@v6
       with:
         path: daq-buildtools-test
-
-    - name: Troubleshoot llvm package
-      run: |
-        source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
-        setup_dbt latest
-        dbt-setup-release -n last_fddaq
-        spack find llvm
-        spack find --loaded llvm
-        spack list llvm
+        persist-credentials: false
 
     - name: Run test_daq-buildtools script
       run: |

From 0efa497649f1d378a9629a86afb450972c5aac9b Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Wed, 25 Feb 2026 11:01:48 -0600
Subject: [PATCH 17/22] Only run dbt-clang-format if llvm is installed

---
 scripts/test_daq-buildtools.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/test_daq-buildtools.sh b/scripts/test_daq-buildtools.sh
index 7a15ef8..073a7b3 100755
--- a/scripts/test_daq-buildtools.sh
+++ b/scripts/test_daq-buildtools.sh
@@ -112,8 +112,12 @@ echo "******************************TEST dbt-build --unittest ******************
 dbt-build --unittest || exit 10
 
 echo "******************************TEST dbt-clang-format.sh **********************************"
-cd $DBT_AREA_ROOT/sourcecode
-dbt-clang-format.sh $repo --view-differences-only || exit 11
+if spack find --loaded llvm >/dev/null 2>&1; then
+    cd $DBT_AREA_ROOT/sourcecode
+    dbt-clang-format.sh $repo --view-differences-only || exit 11
+else
+    echo "WARNING: Skipping dbt-clang-format.sh since llvm is not loaded"
+fi
 
 # Test building against a sourcecode directory outside of the work area
 echo "***********************TEST dbt-build with external sourcecode **************************"

From 454c79855efcbe470be7bc6c654c8565e4e11ca0 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Wed, 25 Feb 2026 11:14:09 -0600
Subject: [PATCH 18/22] Correctly handle cds

---
 scripts/test_daq-buildtools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test_daq-buildtools.sh b/scripts/test_daq-buildtools.sh
index 073a7b3..b311c08 100755
--- a/scripts/test_daq-buildtools.sh
+++ b/scripts/test_daq-buildtools.sh
@@ -115,13 +115,13 @@ echo "******************************TEST dbt-clang-format.sh *******************
 if spack find --loaded llvm >/dev/null 2>&1; then
     cd $DBT_AREA_ROOT/sourcecode
     dbt-clang-format.sh $repo --view-differences-only || exit 11
+    cd ..
 else
     echo "WARNING: Skipping dbt-clang-format.sh since llvm is not loaded"
 fi
 
 # Test building against a sourcecode directory outside of the work area
 echo "***********************TEST dbt-build with external sourcecode **************************"
-cd ..
 mv sourcecode $release_tmpdir
 ln -s $release_tmpdir/sourcecode
 dbt-build --clean || exit 12

From f3f50778b3a948a1409105fcab5346a7c47ba0e6 Mon Sep 17 00:00:00 2001
From: Andrew Mogan <amogan@fnal.gov>
Date: Wed, 25 Feb 2026 11:28:31 -0600
Subject: [PATCH 19/22] Only run dbt-lcov.sh if lcov is loaded

---
 scripts/test_daq-buildtools.sh | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/scripts/test_daq-buildtools.sh b/scripts/test_daq-buildtools.sh
index b311c08..4a982d9 100755
--- a/scripts/test_daq-buildtools.sh
+++ b/scripts/test_daq-buildtools.sh
@@ -101,38 +101,41 @@ cd ..
 echo "**********************************TEST dbt-build ****************************************"
 dbt-build || exit 8
 
-echo "******************************TEST dbt-build --lint *************************************"
-if spack find --loaded llvm >/dev/null 2>&1; then
-    dbt-build --lint || exit 9
-else
-    echo "WARNING: Skipping dbt-build --lint since llvm is not loaded"
-fi
-
 echo "******************************TEST dbt-build --unittest *********************************"
-dbt-build --unittest || exit 10
+dbt-build --unittest || exit 9
 
-echo "******************************TEST dbt-clang-format.sh **********************************"
 if spack find --loaded llvm >/dev/null 2>&1; then
+    echo "******************************TEST dbt-build --lint *************************************"
+    dbt-build --lint || exit 10
+
+    echo "******************************TEST dbt-clang-format.sh *************************************"
     cd $DBT_AREA_ROOT/sourcecode
     dbt-clang-format.sh $repo --view-differences-only || exit 11
     cd ..
 else
-    echo "WARNING: Skipping dbt-clang-format.sh since llvm is not loaded"
+    echo "WARNING: Skipping dbt-build --lint and dbt-clang-format.sh since llvm is not loaded"
+fi
+
+if spack find --loaded lcov >/dev/null 2>&1; then
+    echo "*********************************TEST dbt-lcov.sh****************************************"
+    dbt-lcov.sh || exit 12
+else
+    echo "WARNING: Skipping dbt-lcov.sh since lcov is not loaded"
 fi
 
 # Test building against a sourcecode directory outside of the work area
 echo "***********************TEST dbt-build with external sourcecode **************************"
 mv sourcecode $release_tmpdir
 ln -s $release_tmpdir/sourcecode
-dbt-build --clean || exit 12
+dbt-build --clean || exit 13
 
 echo "*****************************TEST dbt-build --codegen **********************************"
-dbt-build --codegen || exit 13
+dbt-build --codegen || exit 14
+
 
 echo "********************TEST local workarea Spack package installation **********************"
-spack install py-wesanderson || exit 14
+spack install py-wesanderson || exit 15
 
-echo "*********************************TEST dbt-lcov.sh****************************************"
-dbt-lcov.sh || exit 15
+echo "Testing completed successfully."
 
 exit 0

From 73e03a76af7f176bf266c1ae39c56d6efb13581f Mon Sep 17 00:00:00 2001
From: John Freeman <jcfree@daq.fnal.gov>
Date: Wed, 25 Feb 2026 13:57:21 -0600
Subject: [PATCH 20/22] JCF: similar to what Andrew did, create a branch
 specifically to trigger the work in PR #336

---
 .github/workflows/test_daq_buildtools.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test_daq_buildtools.yml b/.github/workflows/test_daq_buildtools.yml
index e4393bc..8e977f8 100644
--- a/.github/workflows/test_daq_buildtools.yml
+++ b/.github/workflows/test_daq_buildtools.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - develop
+      - johnfreeman/test_daq_buildtools_workflow
     types: [opened, reopened, synchronize]
 
 jobs:

From c0b257285753e608e2c56cf6f5f6c52385908d57 Mon Sep 17 00:00:00 2001
From: John Freeman <jcfree@daq.fnal.gov>
Date: Wed, 25 Feb 2026 14:16:30 -0600
Subject: [PATCH 21/22] JCF: a change for its own sake

---
 docs/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/README.md b/docs/README.md
index 36af55e..c068afc 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,3 +1,5 @@
+_JCF, Feb-25-2026: if you can read this line, please contact me_
+
 # DUNE DAQ Buildtools
 
 _This document was last edited May-28-2025_

From 412ccf2aef30e908f39e831b57147a00d5c5218b Mon Sep 17 00:00:00 2001
From: John Freeman <jcfree@daq.fnal.gov>
Date: Wed, 25 Feb 2026 14:27:33 -0600
Subject: [PATCH 22/22] JCF: ensure that dbt-build will return nonzero

---
 bin/dbt-build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/dbt-build b/bin/dbt-build
index e0c561e..9f11f9f 100755
--- a/bin/dbt-build
+++ b/bin/dbt-build
@@ -1,8 +1,12 @@
 #!/usr/bin/env python3
 
+
 import os
 import sys
 
+print("Intentionally crashing dbt-build out")
+sys.exit(1)
+
 if "DBT_ROOT" in os.environ:
    DBT_ROOT=os.environ["DBT_ROOT"]
 else: