From 131fcbcaffd1e3bcf5ab766ec497b5d768955310 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 1 Mar 2023 23:23:02 +1100
Subject: [PATCH] Adjust test jobs for new log directory.

---
 .github/run_test.sh              | 2 +-
 .github/workflows/c-cpp.yml      | 1 +
 .github/workflows/selfhosted.yml | 1 +
 .github/workflows/upstream.yml   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/run_test.sh b/.github/run_test.sh
index 8eeaf5e9b..d5fd487d9 100755
--- a/.github/run_test.sh
+++ b/.github/run_test.sh
@@ -21,7 +21,7 @@ if [ ! -z "$SUDO" ] && [ ! -z "$TEST_SSH_HOSTBASED_AUTH" ]; then
 fi
 
 output_failed_logs() {
-    for i in regress/failed*; do
+    for i in regress/failed*.log; do
         if [ -f "$i" ]; then
             echo -------------------------------------------------------------------------
             echo LOGFILE $i
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e6ea49550..f3163884a 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -123,3 +123,4 @@ jobs:
           regress/valgrind-out/
           regress/asan.log.*
           regress/msan.log.*
+          regress/log/*
diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml
index d067e48f8..d38cba520 100644
--- a/.github/workflows/selfhosted.yml
+++ b/.github/workflows/selfhosted.yml
@@ -111,6 +111,7 @@ jobs:
           config.h
           config.log
           regress/*.log
+          regress/log/*
           regress/valgrind-out/
     - name: shutdown VM
       if: always()
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 1e2c2acb7..b280793d3 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -46,6 +46,7 @@ jobs:
         name: ${{ matrix.target }}-${{ matrix.config }}-logs
         path: |
           /usr/obj/regress/usr.bin/ssh/obj/*.log
+          /usr/obj/regress/usr.bin/ssh/obj/log/*
     - name: shutdown VM
       if: always()
       run: vmshutdown