(retracted by #13597, #13593 does the job better)

[p5sagit/p5-mst-13.2.git] / t / test.pl

diff --git a/t/test.pl b/t/test.pl
index c276fb3..bd5d577 100644 (file)
--- a/t/test.pl
+++ b/t/test.pl
@@ -6,6 +6,7 @@ my $test = 1;
 my $planned;
 
 $TODO = 0;
+$NO_ENDING = 0;
 
 sub plan {
     my $n;
@@ -21,8 +22,8 @@ sub plan {
 
 END {
     my $ran = $test - 1;
-    if (defined $planned && $planned != $ran) {
-       print STDOUT "# Looks like you planned $planned tests but ran $ran.\n";
+    if (!$NO_ENDING && defined $planned && $planned != $ran) {
+        print STDOUT "# Looks like you planned $planned tests but ran $ran.\n";
     }
 }
 
@@ -41,6 +42,8 @@ sub _ok {
     # VMS will avenge.
     my $out;
     if ($name) {
+        # escape out '#' or it will interfere with '# skip' and such
+        $name =~ s/#/\\#/g;
        $out = $pass ? "ok $test - $name" : "not ok $test - $name";
     } else {
        $out = $pass ? "ok $test" : "not ok $test";
@@ -289,15 +292,22 @@ sub which_perl {
        # which is a bit heavyweight to do here.
        
        if ($Perl =~ /^perl\Q$exe\E$/i) {
+           my $perl = "perl$exe";
            eval "require File::Spec";
            if ($@) {
                warn "test.pl had problems loading File::Spec: $@";
+               $Perl = "./$perl";
            } else {
-               $Perl = File::Spec->catfile(File::Spec->curdir(), "perl$exe");
+               $Perl = File::Spec->catfile(File::Spec->curdir(), $perl);
            }
        }
        
-       warn "which_perl: cannot find perl from $^X" unless -f $Perl;
+        # Its like this.  stat on Cygwin treats 'perl' to mean 'perl.exe'
+        # but open does not.  This can get confusing, so to be safe we
+        # always put the .exe on the end on Cygwin.
+        $Perl .= $exe if $^O eq 'cygwin' && $Perl !~ /\Q$exe\E$/;
+
+       warn "which_perl: cannot find $Perl from $^X" unless -f $Perl;
        
        # For subcommands to use.
        $ENV{PERLEXE} = $Perl;