From a2e707225b7913219ae7307a5b6a40d2be0f9fa7 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Thu, 13 Aug 2020 15:48:21 -0400
Subject: [PATCH] Fix the ratchet.sh script.

---
 misc/python3/ratchet.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/misc/python3/ratchet.sh b/misc/python3/ratchet.sh
index aa768cd06..b383ce199 100755
--- a/misc/python3/ratchet.sh
+++ b/misc/python3/ratchet.sh
@@ -9,11 +9,10 @@ base=$(pwd)
 # Actually, though, trial outputs some things that are only gitignored in the project root.
 cd "../.."
 
-# Since both of the next calls are expected to exit non-0, relax our guard.
-set +e
-trial --reporter=subunitv2-file allmydata
-subunit2junitxml < "${SUBUNITREPORTER_OUTPUT_PATH}" > "$base/results.xml"
-set -e
+export SUBUNITREPORTER_OUTPUT_PATH="$base/results.subunit2"
+# Since the next two calls are expected to exit non-0, relax our guard.
+trial --reporter=subunitv2-file allmydata || true
+subunit2junitxml < "${SUBUNITREPORTER_OUTPUT_PATH}" > "$base/results.xml" || true
 
 # Okay, now we're clear.
 cd "$base"