diff options
| author | Jonathan "Duke" Leto <jonathan@leto.net> | 2011-05-23 20:31:11 -0700 |
|---|---|---|
| committer | Jonathan "Duke" Leto <jonathan@leto.net> | 2011-05-23 20:31:11 -0700 |
| commit | 28e39448c2b105ed9c1e3489f4672d34218dde20 (patch) | |
| tree | f7d0349fa5e8c5987e7da0c26022d385e82a8262 /scripts/capsule.sh | |
| parent | Merge branch 'master' into git_refactor (diff) | |
| download | jitterbug-28e39448c2b105ed9c1e3489f4672d34218dde20.tar.gz | |
Unbreak capsule.sh
Diffstat (limited to '')
| -rwxr-xr-x | scripts/capsule.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/capsule.sh b/scripts/capsule.sh index b176ff7..548780e 100755 --- a/scripts/capsule.sh +++ b/scripts/capsule.sh @@ -9,14 +9,12 @@ 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_OPTS dzil test >> $logfile 2>&1 + HARNESS_VERBOSE=1 HARNESS_TIMER=1 dzil test >> $logfile 2>&1 elif [ -f 'Build.PL' ]; then echo "Found Build.PL, using Build.PL" perl Build.PL >> $logfile 2>&1 @@ -24,23 +22,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_OPTS ./Build test --verbose >> $logfile 2>&1 + HARNESS_VERBOSE=1 HARNESS_TIMER=1 ./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_OPTS make test >> $logfile 2>&1 + HARNESS_VERBOSE=1 HARNESS_TIMER=1 make test >> $logfile 2>&1 elif [ -f 'setup.pir' ]; then echo "Found setup.pir" - $HARNESS_OPTS parrot setup.pir test >> $logfile 2>&1 + HARNESS_VERBOSE=1 HARNESS_TIMER=1 parrot setup.pir test >> $logfile 2>&1 elif [ -f 'setup.nqp' ]; then echo "Found setup.nqp" - $HARNESS_OPTS parrot-nqp setup.nqp test >> $logfile 2>&1 + HARNESS_VERBOSE=1 HARNESS_TIMER=1 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_OPTS make test >> $logfile 2>&1 + HARNESS_VERBOSE=1 HARNESS_TIMER=1 make test >> $logfile 2>&1 elif [ -f 'Makefile' ]; then echo "Found a Makefile" make test >> $logfile 2>&1 |