From 2b56369560823434b17b69f0953e3ed4288e4fd4 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sun, 22 May 2011 23:06:50 -0700 Subject: Teach capsule about HARNESS_TIMER --- scripts/capsule.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/capsule.sh b/scripts/capsule.sh index 9fca79e..a47972a 100755 --- a/scripts/capsule.sh +++ b/scripts/capsule.sh @@ -9,12 +9,14 @@ builddir=$1 report_path=$2 perlbrew=$3 +HARNESS_OPTS="HARNESS_VERBOSE=1 HARNESS_TIMER=1" + function jitterbug_build () { if [ -f 'dist.ini' ]; then echo "Found dist.ini, using Dist::Zilla" dzil authordeps | cpanm >> $logfile 2>&1 cpanm --installdeps . >> $logfile 2>&1 - HARNESS_VERBOSE=1 dzil test >> $logfile 2>&1 + $HARNESS_OPTS dzil test >> $logfile 2>&1 elif [ -f 'Build.PL' ]; then echo "Found Build.PL, using Build.PL" perl Build.PL >> $logfile 2>&1 @@ -22,23 +24,23 @@ function jitterbug_build () { cpanm --installdeps . >> $logfile 2>&1 # Run this again in case our Build is out of date (suboptimal) perl Build.PL >> $logfile 2>&1 - HARNESS_VERBOSE=1 ./Build test --verbose >> $logfile 2>&1 + $HARNESS_OPTS ./Build test --verbose >> $logfile 2>&1 elif [ -f 'Makefile.PL' ]; then echo "Found Makefile.PL" perl Makefile.PL >> $logfile 2>&1 cpanm --installdeps . >> $logfile 2>&1 - HARNESS_VERBOSE=1 make test >> $logfile 2>&1 + $HARNESS_OPTS make test >> $logfile 2>&1 elif [ -f 'setup.pir' ]; then echo "Found setup.pir" - HARNESS_VERBOSE=1 parrot setup.pir test >> $logfile 2>&1 + $HARNESS_OPTS parrot setup.pir test >> $logfile 2>&1 elif [ -f 'setup.nqp' ]; then echo "Found setup.nqp" - HARNESS_VERBOSE=1 parrot-nqp setup.nqp test >> $logfile 2>&1 + $HARNESS_OPTS parrot-nqp setup.nqp test >> $logfile 2>&1 elif [ -f 'Configure.pl' ]; then echo "Found Configure.pl" perl Configure.pl >> $logfile 2>&1 cpanm --installdeps . >> $logfile 2>&1 - HARNESS_VERBOSE=1 make test >> $logfile 2>&1 + $HARNESS_OPTS make test >> $logfile 2>&1 elif [ -f 'Makefile' ]; then echo "Found a Makefile" make test >> $logfile 2>&1 -- cgit 1.4.1