In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5c39bf1981fd94f2f7d0c551c307701ce0faeda6?hp=b75763d608047188e76fcf5249a427b3ad13e87a>
- Log ----------------------------------------------------------------- commit 5c39bf1981fd94f2f7d0c551c307701ce0faeda6 Author: David Mitchell <[email protected]> Date: Thu Jun 13 09:00:56 2013 +0100 Benchmark.t: fix skip() call M lib/Benchmark.t commit f12bac9728169abf3576360e2dfa20c3c121d7ca Author: David Mitchell <[email protected]> Date: Thu Jun 13 08:54:35 2013 +0100 Benchmark.t: make calibration a test As a temporary measure, make a calibration failure not only a skip but a failed test too, so I can see whether the real test fails more often in smokes than the calibration. M lib/Benchmark.t ----------------------------------------------------------------------- Summary of changes: lib/Benchmark.t | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Benchmark.t b/lib/Benchmark.t index 6bf39f6..b7d4e7c 100644 --- a/lib/Benchmark.t +++ b/lib/Benchmark.t @@ -8,7 +8,7 @@ BEGIN { use warnings; use strict; use vars qw($foo $bar $baz $ballast); -use Test::More tests => 196; +use Test::More tests => 197; use Benchmark qw(:all); @@ -114,6 +114,7 @@ my $calibration; $calibration = $td3/(3*$td1); # for diag output } +ok(!$INCONSISTENT_CLOCK, "temporary calibration test"); print "# Burning CPU to benchmark things; will take time...\n"; @@ -154,7 +155,7 @@ $in_onesec_adj *= (1/$cpu1); # adjust because may not have run for exactly 1s print "# in_onesec_adj=$in_onesec_adj adjusted iterations\n"; SKIP: { - skip("INCONSISTENT CLOCK") if $INCONSISTENT_CLOCK; + skip(1, "INCONSISTENT CLOCK") if $INCONSISTENT_CLOCK; ok(cmp_delta($in_onesec_adj, $estimate, $DELTA), "is $in_onesec_adj within $DELTA of estimate ($estimate)?") -- Perl5 Master Repository
