Tagging 2.99_07, version bump

leto · Nov 1, 2007 · 2fee37f · 2fee37f
1 parent 90b3c34
commit 2fee37f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 20 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,12 @@
 Revision history for Test-Harness
 
+2.99_07 2007-11-01
+        - Fix for #21938: Unable to handle circular links
+        - Fix for #24926: prove -b and -l should use absolute paths
+        - Fixed prove switches. Big oops. How the hell did we miss that?
+        - Consolidated quiet, really_quiet, verbose into verbosity.
+        - Various VMS related fixes to tests
+
 2.99_06 2007-10-30
         - Added skip_all method to TAP::Parser.
         - Display reason for skipped tests.

diff --git a/MANIFEST b/MANIFEST
@@ -56,6 +56,7 @@ t/compat/failure.t
 t/compat/inc-propagation.t
 t/compat/inc_taint.t
 t/compat/nonumbers.t
+t/compat/regression.t
 t/compat/test-harness-compat.t
 t/compat/version.t
 t/console.t

diff --git a/lib/App/Prove.pm b/lib/App/Prove.pm
@@ -324,16 +324,16 @@ sub _get_switches {
 
     # notes that -T or -t must be at the front of the switches!
     if ( $self->taint_fail ) {
-        push @switches, 'T';
+        push @switches, '-T';
     }
     elsif ( $self->taint_warn ) {
-        push @switches, 't';
+        push @switches, '-t';
     }
     if ( $self->warnings_fail ) {
-        push @switches, 'W';
+        push @switches, '-W';
     }
     elsif ( $self->warnings_warn ) {
-        push @switches, 'w';
+        push @switches, '-w';
     }
 
     return @switches ? \@switches : ();
@@ -352,6 +352,9 @@ sub _get_lib {
         push @libs, @{ $self->includes };
     }
 
+    #24926
+    @libs = map { File::Spec->rel2abs($_) } @libs;
+
     # Huh?
     return @libs ? \@libs : ();
 }
@@ -400,7 +403,10 @@ sub _expand_dir {
     my @tests;
     if ( $self->recurse ) {
         find(
-            sub { -f && /\.t$/ && push @tests => $File::Find::name },
+            {   follow => 1,    #21938
+                wanted =>
+                  sub { -f && /\.t$/ && push @tests => $File::Find::name }
+            },
             $dir
         );
     }

diff --git a/lib/Test/Harness.pm b/lib/Test/Harness.pm
@@ -191,7 +191,7 @@ sub _new_harness {
 # Get the parts of @INC which are changed from the stock list AND
 # preserve reordering of stock directories.
 sub _filtered_inc {
-    my @inc = @INC;
+    my @inc = grep { !ref } @INC; #28567
 
     if (IS_VMS) {
 

diff --git a/t/compat/regression.t b/t/compat/regression.t
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+use strict;
+use lib 't/lib';
+
+use Test::More tests => 2;
+
+BEGIN {
+    use_ok('Test::Harness');
+}
+
+{
+    #28567
+    unshift @INC, 'wibble';
+    my @before = Test::Harness::_filtered_inc();
+    unshift @INC, sub {die};
+    my @after = Test::Harness::_filtered_inc();
+    is_deeply \@after, \@before, 'subref removed from @INC';
+}
diff --git a/t/prove.t b/t/prove.t
@@ -4,6 +4,7 @@ use strict;
 use lib 't/lib';
 
 use Test::More;
+use File::Spec;
 
 use App::Prove;
 
@@ -40,6 +41,11 @@ sub _shuffle {
 
 package main;
 
+sub mabs {
+    my $ar = shift;
+    return [ map { File::Spec->rel2abs($_) } @$ar ];
+}
+
 {
     my @import_log = ();
 
@@ -202,7 +208,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   lib       => ['blib/lib'],
+                    {   lib => mabs( ['blib/lib'] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -314,7 +320,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   lib       => [qw( four five six )],
+                    {   lib => mabs( [qw( four five six )] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -332,7 +338,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   lib       => ['lib'],
+                    {   lib => mabs( ['lib'] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -386,7 +392,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   verbosity => -1
+                    { verbosity => -1
                     },
                     'TAP::Harness',
                     'one', 'two', 'three'
@@ -403,7 +409,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   verbosity => -2
+                    { verbosity => -2
                     },
                     'TAP::Harness',
                     'one', 'two', 'three'
@@ -470,7 +476,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   switches  => ['T'],
+                    {   switches  => ['-T'],
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -488,7 +494,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   switches  => ['t'],
+                    {   switches  => ['-t'],
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -523,7 +529,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   switches  => ['W'],
+                    {   switches  => ['-W'],
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -541,7 +547,7 @@ BEGIN {    # START PLAN
             },
             runlog => [
                 [   '_runtests',
-                    {   switches  => ['w'],
+                    {   switches  => ['-w'],
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -629,7 +635,7 @@ BEGIN {    # START PLAN
             expect   => { lib   => 1 },
             runlog   => [
                 [   '_runtests',
-                    {   lib       => ['lib'],
+                    {   lib => mabs( ['lib'] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -646,7 +652,7 @@ BEGIN {    # START PLAN
             expect   => { lib      => 1 },
             runlog   => [
                 [   '_runtests',
-                    {   lib       => ['lib'],
+                    {   lib => mabs( ['lib'] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -663,7 +669,7 @@ BEGIN {    # START PLAN
             expect   => { blib  => 1 },
             runlog   => [
                 [   '_runtests',
-                    {   lib       => ['blib/lib'],
+                    {   lib => mabs( ['blib/lib'] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -680,7 +686,7 @@ BEGIN {    # START PLAN
             expect   => { blib      => 1 },
             runlog   => [
                 [   '_runtests',
-                    {   lib       => ['blib/lib'],
+                    {   lib => mabs( ['blib/lib'] ),
                         verbosity => 0
                     },
                     'TAP::Harness',
@@ -827,7 +833,7 @@ BEGIN {    # START PLAN
             expect   => { quiet => 1 },
             runlog   => [
                 [   '_runtests',
-                    {   verbosity => -1
+                    { verbosity => -1
                     },
                     'TAP::Harness',
                     $dummy_test