try a bit harder to properly merge master

This commit is contained in:
Maciej Fijalkowski 2020-08-12 18:27:50 +02:00
parent c37a2b0a89
commit 820586cadb

View File

@ -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.