From 2f7506a8ca70d7a91cc66c7e0a7821330bf7a31a Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 21 Nov 2023 16:08:54 -0800
Subject: [PATCH] More logs on failure/timeout.

---
 .github/workflows/fsanitize-check.yml | 1 +
 .github/workflows/macos-check.yml     | 1 +
 .github/workflows/ubuntu-check.yml    | 1 +
 scripts/client.test                   | 1 +
 scripts/firmware.test                 | 1 +
 scripts/multithread.test              | 1 +
 scripts/nbclient.test                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/.github/workflows/fsanitize-check.yml b/.github/workflows/fsanitize-check.yml
index cb78fcb4e..c334c5328 100644
--- a/.github/workflows/fsanitize-check.yml
+++ b/.github/workflows/fsanitize-check.yml
@@ -96,3 +96,4 @@ jobs:
       if: failure() || cancelled()
       run: |
         cat test-suite.log
+        cat scripts/*.log
diff --git a/.github/workflows/macos-check.yml b/.github/workflows/macos-check.yml
index a0b129074..7732f98a0 100644
--- a/.github/workflows/macos-check.yml
+++ b/.github/workflows/macos-check.yml
@@ -82,3 +82,4 @@ jobs:
       if: failure() || cancelled()
       run: |
         cat test-suite.log
+        cat scripts/*.log
diff --git a/.github/workflows/ubuntu-check.yml b/.github/workflows/ubuntu-check.yml
index e9366b0a9..f09b8b57b 100644
--- a/.github/workflows/ubuntu-check.yml
+++ b/.github/workflows/ubuntu-check.yml
@@ -113,3 +113,4 @@ jobs:
       if: failure() || cancelled()
       run: |
         cat test-suite.log
+        cat scripts/*.log
diff --git a/scripts/client.test b/scripts/client.test
index d31ca0e8c..e86752c26 100755
--- a/scripts/client.test
+++ b/scripts/client.test
@@ -55,6 +55,7 @@ then
             export AM_BWRAPPED=yes
             exec "$bwrap_path" --unshare-net --dev-bind / / "$0" "$@"
         fi
+        unset AM_BWRAPPED
 
         broker_args="-c scripts/broker_test/mosquitto.conf"
         port=11883
diff --git a/scripts/firmware.test b/scripts/firmware.test
index 92bd646e5..13d743b9e 100755
--- a/scripts/firmware.test
+++ b/scripts/firmware.test
@@ -62,6 +62,7 @@ then
             export AM_BWRAPPED=yes
             exec "$bwrap_path" --unshare-net --dev-bind / / "$0" "$@"
         fi
+        unset AM_BWRAPPED
 
         broker_args="-c scripts/broker_test/mosquitto.conf"
         if test $has_tls == yes
diff --git a/scripts/multithread.test b/scripts/multithread.test
index 7b1f6326e..0f382e717 100755
--- a/scripts/multithread.test
+++ b/scripts/multithread.test
@@ -54,6 +54,7 @@ then
             export AM_BWRAPPED=yes
             exec "$bwrap_path" --unshare-net --dev-bind / / "$0" "$@"
         fi
+        unset AM_BWRAPPED
 
         broker_args="-c scripts/broker_test/mosquitto.conf"
         port=11883
diff --git a/scripts/nbclient.test b/scripts/nbclient.test
index e6a1fc456..9c15f786b 100755
--- a/scripts/nbclient.test
+++ b/scripts/nbclient.test
@@ -56,6 +56,7 @@ then
             export AM_BWRAPPED=yes
             exec "$bwrap_path" --unshare-net --dev-bind / / "$0" "$@"
         fi
+        unset AM_BWRAPPED
 
         broker_args="-c scripts/broker_test/mosquitto.conf"
         port=11883