From: David Landgren Date: Mon, 1 May 2006 15:50:03 +0000 (+0200) Subject: Re: [PATCH] provide diag() and don't use ++ in test.pl X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=485f531e502dcba5ee00641e3b64706a16e1b995;p=p5sagit%2Fp5-mst-13.2.git Re: [PATCH] provide diag() and don't use ++ in test.pl Message-ID: <4456120B.3000302@landgren.net> Plus some additional comment (also from David) about WHY not to use ++ in test.pl p4raw-id: //depot/perl@28037 --- diff --git a/t/test.pl b/t/test.pl index cdfa018..1562854 100644 --- a/t/test.pl +++ b/t/test.pl @@ -1,6 +1,20 @@ # # t/test.pl - most of Test::More functionality without the fuss + + +# NOTE: +# +# Increment ($x++) has a certain amount of cleverness for things like +# +# $x = 'zz'; +# $x++; # $x eq 'aaa'; # +# stands more chance of breaking than just a simple +# +# $x = $x + 1 +# +# In this file, we use the latter "Baby Perl" approach, and increment +# will be worked over by t/op/inc.t $Level = 1; my $test = 1; @@ -49,6 +63,10 @@ sub _diag { } +sub diag { + _diag(@_); +} + sub skip_all { if (@_) { print STDOUT "1..0 # Skipped: @_\n"; @@ -81,7 +99,7 @@ sub _ok { # Ensure that the message is properly escaped. _diag @mess; - $test++; + $test = $test + 1; # don't use ++ return $pass; } @@ -276,7 +294,7 @@ sub curr_test { } sub next_test { - $test++; + $test = $test + 1; # don't use ++ } # Note: can't pass multipart messages since we try to @@ -286,7 +304,7 @@ sub skip { my $n = @_ ? shift : 1; for (1..$n) { print STDOUT "ok $test # skip: $why\n"; - $test++; + $test = $test + 1; } local $^W = 0; last SKIP; @@ -298,7 +316,7 @@ sub todo_skip { for (1..$n) { print STDOUT "not ok $test # TODO & SKIP: $why\n"; - $test++; + $test = $test + 1; } local $^W = 0; last TODO; @@ -485,7 +503,7 @@ sub runperl { my $tainted = ${^TAINT}; my %args = @_; - exists $args{switches} && grep m/^-T$/, @{$args{switches}} and $tainted++; + exists $args{switches} && grep m/^-T$/, @{$args{switches}} and $tainted = $tainted + 1; if ($tainted) { # We will assume that if you're running under -T, you really mean to