diff options
| -rwxr-xr-x | run_tests.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/run_tests.sh b/run_tests.sh index 4d02fe570..fc754bbb0 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -137,7 +137,14 @@ function run_tests { testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'` TESTRTESTS="$TESTRTESTS --testr-args='--subunit $testropts $testrargs'" echo "Running \`${wrapper} $TESTRTESTS\`" - bash -c "${wrapper} $TESTRTESTS | ${wrapper} tools/colorizer.py" + if ${wrapper} which subunit-2to1 2>&1 > /dev/null + then + # subunit-2to1 is present, testr subunit stream should be in version 2 + # format. Convert to version one before colorizing. + bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit-2to1 | ${wrapper} tools/colorizer.py" + else + bash -c "${wrapper} $TESTRTESTS | ${wrapper} tools/colorizer.py" + fi RESULT=$? set -e |