From 5f16b64639594059da44981209eeda3b36d12280 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Wed, 6 Mar 2024 14:39:23 -0800
Subject: [PATCH] Attempt to exit test containers on tests exit while also
 showing test output.

---
 .gitea/workflows/test.yaml   | 1 -
 scripts/run-end-to-end-tests | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
index 54d35e54..571ea9d7 100644
--- a/.gitea/workflows/test.yaml
+++ b/.gitea/workflows/test.yaml
@@ -9,4 +9,3 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: scripts/run-end-to-end-tests
-      - run: find . -name borgmatic-1.8.9.dev0
diff --git a/scripts/run-end-to-end-tests b/scripts/run-end-to-end-tests
index eb88578f..2adf8bb5 100755
--- a/scripts/run-end-to-end-tests
+++ b/scripts/run-end-to-end-tests
@@ -8,7 +8,7 @@
 # For more information, see:
 # https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/
 
-set -e
+set -ex
 
 USER_PODMAN_SOCKET_PATH=/run/user/$UID/podman/podman.sock
 
@@ -17,5 +17,6 @@ if [ -e "$USER_PODMAN_SOCKET_PATH" ]; then
 fi
 
 docker-compose --file tests/end-to-end/docker-compose.yaml up --force-recreate \
-    --renew-anon-volumes --detach
+    --renew-anon-volumes &
 docker-compose --file tests/end-to-end/docker-compose.yaml wait --down-project tests
+find . -name borgmatic-1.8.9.dev0