summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2023-03-01 23:23:02 +1100
committerDarren Tucker <dtucker@dtucker.net>2023-03-01 23:23:02 +1100
commit131fcbcaffd1e3bcf5ab766ec497b5d768955310 (patch)
tree3817055a3b0f3e06b2e584c30686a7917b2284cb
parenta6f4ac8a2baf77e5361cfa017d0dc250d1409bec (diff)
downloadopenssh-git-131fcbcaffd1e3bcf5ab766ec497b5d768955310.tar.gz
Adjust test jobs for new log directory.
-rwxr-xr-x.github/run_test.sh2
-rw-r--r--.github/workflows/c-cpp.yml1
-rw-r--r--.github/workflows/selfhosted.yml1
-rw-r--r--.github/workflows/upstream.yml1
4 files changed, 4 insertions, 1 deletions
diff --git a/.github/run_test.sh b/.github/run_test.sh
index 8eeaf5e9..d5fd487d 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 e6ea4955..f3163884 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 d067e48f..d38cba52 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 1e2c2acb..b280793d 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