From 56676e571187ff5144a3dff379dcf69d8bd2aa07 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Sun, 23 Oct 2016 17:14:15 -0400 Subject: [PATCH 1/2] Bug fix: collect test results when running in multiprocess mode. --- scripts/generic-ci-tests.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index fdb6452101..8ae10b1b5d 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -168,7 +168,18 @@ case "$TEST_SUITE" in cp -R $HOME/firefox/ firefox/ export SELENIUM_FIREFOX_PATH=firefox/firefox - PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky --with-xunit" + case "$NUMBER_OF_BOKCHOY_THREADS" in + + "1"|1) + XUNIT_ARG=" --with-xunit" + ;; + + *) + XUNIT_ARG=" --with-xunitmp" + ;; + esac + + PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky $XUNIT_ARG" case "$SHARD" in From 8aa132d44e20fe4f9eb524157b66e5faeb97fbb3 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Wed, 26 Oct 2016 12:43:46 -0400 Subject: [PATCH 2/2] Always xunitmp since it's supported no matter the # of processes --- scripts/generic-ci-tests.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index 8ae10b1b5d..0c72720c8d 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -168,18 +168,7 @@ case "$TEST_SUITE" in cp -R $HOME/firefox/ firefox/ export SELENIUM_FIREFOX_PATH=firefox/firefox - case "$NUMBER_OF_BOKCHOY_THREADS" in - - "1"|1) - XUNIT_ARG=" --with-xunit" - ;; - - *) - XUNIT_ARG=" --with-xunitmp" - ;; - esac - - PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky $XUNIT_ARG" + PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky --with-xunitmp" case "$SHARD" in