In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/76220d5e23b8dfc7d1b0accf1b99c079f0b43419?hp=22d7dfedf6b2f543bc146063b4bf98d2ae20fd86>
- Log -----------------------------------------------------------------
commit 76220d5e23b8dfc7d1b0accf1b99c079f0b43419
Author: Nicholas Clark <n...@ccl4.org>
Date: Wed Mar 2 13:46:10 2011 +0000
Fix the TODO handling in t/re/ReTest.pl's skip()
It now does TODO & SKIP. However, currently I believe that nothing that
uses it
is calling skip() with a TODO test.
-----------------------------------------------------------------------
Summary of changes:
t/re/ReTest.pl | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/t/re/ReTest.pl b/t/re/ReTest.pl
index 766065c..fc25087 100644
--- a/t/re/ReTest.pl
+++ b/t/re/ReTest.pl
@@ -102,16 +102,20 @@ sub skip {
safe_globals();
$why =~ s/\n.*//s;
$why .= "; Bug $BugId" if defined $BugId;
- # seems like the new harness code doesn't like todo and skip to be mixed.
- # which seems like a bug in the harness to me. -- dmq
- #$why .= " # TODO $TODO" if defined $TODO;
-
+ my $ok;
+ if (defined $TODO) {
+ $why = "TODO & SKIP $why $TODO";
+ $ok = "not ok";
+ } else {
+ $why = "SKIP $why";
+ $ok = "ok";
+ }
+
my $n = shift // 1;
my $line_nr = (caller(0)) [2];
for (1 .. $n) {
++ $test;
- #print "not " if defined $TODO;
- print "ok $test # skip $why\tLine $line_nr\n";
+ print "$ok $test # $why\tLine $line_nr\n";
}
no warnings "exiting";
last SKIP;
--
Perl5 Master Repository
