From 820586cadba69f644cd78ec0fb6865865bced861 Mon Sep 17 00:00:00 2001 From: Maciej Fijalkowski Date: Wed, 12 Aug 2020 18:27:50 +0200 Subject: [PATCH] try a bit harder to properly merge master --- misc/python3/ratchet.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/python3/ratchet.sh b/misc/python3/ratchet.sh index 00f9853c0..aa768cd06 100755 --- a/misc/python3/ratchet.sh +++ b/misc/python3/ratchet.sh @@ -11,8 +11,8 @@ cd "../.." # Since both of the next calls are expected to exit non-0, relax our guard. set +e -SUBUNITREPORTER_OUTPUT_PATH="$base/results.subunit2" trial --reporter=subunitv2-file allmydata -subunit2junitxml < "$base/results.subunit2" > "$base/results.xml" +trial --reporter=subunitv2-file allmydata +subunit2junitxml < "${SUBUNITREPORTER_OUTPUT_PATH}" > "$base/results.xml" set -e # Okay, now we're clear.