From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 8 Sep 2013 16:04:17 +0000 (+0200)
Subject: Only run our own tests concurrently, not stuff in after_success
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ad191fcfeff95660cf13d2f8bfb7ad5162c93039;p=dbsrgits%2FDBIx-Class-Historic.git

Only run our own tests concurrently, not stuff in after_success
---

diff --git a/maint/travis-ci_scripts/40_script.bash b/maint/travis-ci_scripts/40_script.bash
index f3dd078..8be5efc 100755
--- a/maint/travis-ci_scripts/40_script.bash
+++ b/maint/travis-ci_scripts/40_script.bash
@@ -3,15 +3,19 @@
 source maint/travis-ci_scripts/common.bash
 if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 
-export HARNESS_TIMER=1 HARNESS_OPTIONS=c:j$NUMTHREADS
+run_harness_tests() {
+  local -x HARNESS_TIMER=1
+  local -x HARNESS_OPTIONS=c:j$NUMTHREADS
+  make test 2> >(tee "$TEST_STDERR_LOG")
+}
 
 TEST_T0=$SECONDS
 if [[ "$CLEANTEST" = "true" ]] ; then
   echo_err "$(tstamp) Running tests with plain \`make test\`"
   run_or_err "Prepare blib" "make pure_all"
-  make test 2> >(tee "$TEST_STDERR_LOG")
+  run_harness_tests
 else
-  PROVECMD="prove -lrswj$NUMTHREADS t xt"
+  PROVECMD="prove --timer -lrswj$NUMTHREADS t xt"
   echo_err "$(tstamp) running tests with \`$PROVECMD\`"
   $PROVECMD 2> >(tee "$TEST_STDERR_LOG")
 fi