From 2094fa052b37643119913c657adf223e32278850 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 5 Sep 2013 10:33:48 -0700 Subject: [PATCH] Convert subunit logs to subunit v2 before use. * modules/jenkins/files/slave_scripts/run-tox.sh: Feeding subunit v1 through a subunit v2 parser then running the leftovers through a subunit v1 parser is a really slow way to support subunit v1 and subunit v2. Instead convert subunit v1 to subunit v2 to speed up parsing. Local testing indicates this should shave off minutes of test run times. Closes-Bug: #1221094 Change-Id: Ie17708ac217e7468bb1c92cfda7aa50994178817 --- modules/jenkins/files/slave_scripts/run-tox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 7a11cdd06b..1536a1a2a9 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -57,7 +57,7 @@ if [ -d ".testrepository" ] ; then if [ -f ".testrepository/0.2" ] ; then cp .testrepository/0.2 ./subunit_log.txt elif [ -f ".testrepository/0" ] ; then - cp .testrepository/0 ./subunit_log.txt + .tox/$venv/bin/subunit-1to2 < .testrepository/0 > ./subunit_log.txt fi .tox/$venv/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html gzip -9 ./subunit_log.txt