From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 18 Oct 2013 13:15:06 +0000 (+0200)
Subject: Get TAP::Harness to time tests travis-wide
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ffcb35f6af40c3ccb57d03ec882f109b46add4a4;p=dbsrgits%2FDBIx-Class-Historic.git

Get TAP::Harness to time tests travis-wide
---

diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash
index bb7f414..ba9ef10 100755
--- a/maint/travis-ci_scripts/20_install.bash
+++ b/maint/travis-ci_scripts/20_install.bash
@@ -12,7 +12,7 @@ if ! [[ "$CPAN_MIRROR" =~ "http://" ]] ; then
   echo_err "Using $CPAN_MIRROR for the time being"
 fi
 
-export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR"
+export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$CPAN_MIRROR" HARNESS_TIMER=1
 
 # try CPAN's latest offering if requested
 if [[ "$DEVREL_DEPS" == "true" ]] ; then
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index a50753f..fb30db6 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -190,7 +190,7 @@ $(perl -0777 -p -e 's/.+\n\n(?!\z)//s' < /proc/cpuinfo)
 $(free -m -t)
 
 = Environment
-$(env | grep -P 'TEST|TRAVIS|PERL|DBIC' | LC_ALL=C sort | cat -v)
+$(env | grep -P 'TEST|HARNESS|TRAVIS|PERL|DBIC' | LC_ALL=C sort | cat -v)
 
 = Perl in use
 $(perl -V)
diff --git a/maint/travis-ci_scripts/40_script.bash b/maint/travis-ci_scripts/40_script.bash
index fed1396..bad7414 100755
--- a/maint/travis-ci_scripts/40_script.bash
+++ b/maint/travis-ci_scripts/40_script.bash
@@ -4,7 +4,6 @@ source maint/travis-ci_scripts/common.bash
 if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 
 run_harness_tests() {
-  local -x HARNESS_TIMER=1
   local -x HARNESS_OPTIONS=c:j$NUMTHREADS
   make test 2> >(tee "$TEST_STDERR_LOG")
 }
@@ -15,7 +14,7 @@ if [[ "$CLEANTEST" = "true" ]] ; then
   run_or_err "Prepare blib" "make pure_all"
   run_harness_tests
 else
-  PROVECMD="prove --timer -lrswj$NUMTHREADS t xt"
+  PROVECMD="prove -lrswj$NUMTHREADS t xt"
 
   # FIXME - temporary, until Package::Stash is fixed
   if perl -M5.010 -e 1 &>/dev/null ; then