t/x2p/s2p.t fix for VMS in UNIX mode

[p5sagit/p5-mst-13.2.git] / t / comp / use.t

diff --git a/t/comp/use.t b/t/comp/use.t
index 915d0ee..d3a3568 100755 (executable)
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -3,9 +3,10 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
+    $INC{"feature.pm"} = 1; # so we don't attempt to load feature.pm
 }
 
-print "1..31\n";
+print "1..63\n";
 
 # Can't require test.pl, as we're testing the use/require mechanism here.
 
@@ -14,12 +15,6 @@ my $test = 1;
 sub _ok {
     my ($type, $got, $expected, $name) = @_;
 
-    my @caller = caller(2);
-    if ($name) {
-       $name = " $name";
-    }
-    $name .= " at $caller[1] line $caller[2]";
-
     my $result;
     if ($type eq 'is') {
        $result = $got eq $expected;
@@ -31,10 +26,19 @@ sub _ok {
        die "Unexpected type '$type'$name";
     }
     if ($result) {
-       print "ok $test\n";
+       if ($name) {
+           print "ok $test - $name\n";
+       } else {
+           print "ok $test\n";
+       }
     } else {
-       print "not ok $test\n";
-       print "# Failed test $name\n";
+       if ($name) {
+           print "not ok $test - $name\n";
+       } else {
+           print "not ok $test\n";
+       }
+       my @caller = caller(2);
+       print "# Failed test at $caller[1] line $caller[2]\n";
        print "# Got      '$got'\n";
        if ($type eq 'is') {
            print "# Expected '$expected'\n";
@@ -73,6 +77,18 @@ is ($@, '');
 eval "no 5.000;";
 like ($@, qr/Perls since v5\.0\.0 too modern--this is \Q$^V\E, stopped/);
 
+eval "use 5.6;";
+like ($@, qr/Perl v5\.600\.0 required \(did you mean v5\.6\.0\?\)--this is only \Q$^V\E, stopped/);
+
+eval "use 5.8;";
+like ($@, qr/Perl v5\.800\.0 required \(did you mean v5\.8\.0\?\)--this is only \Q$^V\E, stopped/);
+
+eval "use 5.9;";
+like ($@, qr/Perl v5\.900\.0 required \(did you mean v5\.9\.0\?\)--this is only \Q$^V\E, stopped/);
+
+eval "use 5.10;";
+like ($@, qr/Perl v5\.100\.0 required \(did you mean v5\.10\.0\?\)--this is only \Q$^V\E, stopped/);
+
 eval sprintf "use %.6f;", $];
 is ($@, '');
 
@@ -135,49 +151,101 @@ if ($^O eq 'MacOS') {
     is ($@, '');
 
     eval "use lib v100.105";
-    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
+    like ($@, qr/lib version v100.105.0 required--this is only version v35\.360\.0/);
 
     eval "use lib 33.55";
     is ($@, '');
 
     eval "use lib 100.105";
-    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
+    like ($@, qr/lib version 100.105 required--this is only version 35.36/);
 
     local $lib::VERSION = '35.36';
     eval "use lib v33.55";
     like ($@, '');
 
     eval "use lib v100.105";
-    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
+    like ($@, qr/lib version v100.105.0 required--this is only version v35\.360\.0/);
 
     eval "use lib 33.55";
     is ($@, '');
 
     eval "use lib 100.105";
-    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
+    like ($@, qr/lib version 100.105 required--this is only version 35.36/);
 
     local $lib::VERSION = v35.36;
     eval "use lib v33.55";
     is ($@, '');
 
     eval "use lib v100.105";
-    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.036000 \(v35\.36\.0\)/);
+    like ($@, qr/lib version v100.105.0 required--this is only version v35\.36\.0/);
 
     eval "use lib 33.55";
     is ($@, '');
 
     eval "use lib 100.105";
-    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.036000 \(v35\.36\.0\)/);
+    like ($@, qr/lib version 100.105 required--this is only version v35.36/);
 }
 
 
 {
     # Regression test for patch 14937: 
     #   Check that a .pm file with no package or VERSION doesn't core.
-    open F, ">xxx.pm" or die "Cannot open xxx.pm: $!\n";
+    open F, ">xxx$$.pm" or die "Cannot open xxx$$.pm: $!\n";
     print F "1;\n";
     close F;
-    eval "use lib '.'; use xxx 3;";
-    like ($@, qr/^xxx defines neither package nor VERSION--version check failed at/);
-    unlink 'xxx.pm';
+    eval "use lib '.'; use xxx$$ 3;";
+    like ($@, qr/^xxx$$ defines neither package nor VERSION--version check failed at/);
+    unlink "xxx$$.pm";
+}
+
+my @ver = split /\./, sprintf "%vd", $^V;
+
+foreach my $index (-3..+3) {
+    foreach my $v (0, 1) {
+       my @parts = @ver;
+       if ($index) {
+           if ($index < 0) {
+               # Jiggle one of the parts down
+               --$parts[-$index - 1];
+               if ($parts[-$index - 1] < 0) {
+                   # perl's version number ends with '.0'
+                   $parts[-$index - 1] = 0;
+                   $parts[-$index - 2] -= 2;
+               }
+           } else {
+               # Jiggle one of the parts up
+               ++$parts[$index - 1];
+           }
+       }
+       my $v_version = sprintf "v%d.%d.%d", @parts;
+       my $version;
+       if ($v) {
+           $version = $v_version;
+       } else {
+           $version = $parts[0] + $parts[1] / 1000 + $parts[2] / 1000000;
+       }
+
+       eval "use $version";
+       if ($index > 0) {
+           # The future
+           like ($@,
+                 qr/Perl $v_version required--this is only \Q$^V\E, stopped/,
+                 "use $version");
+       } else {
+           # The present or past
+           is ($@, '', "use $version");
+       }
+
+       eval "no $version";
+       if ($index <= 0) {
+           # The present or past
+           like ($@,
+                 qr/Perls since $v_version too modern--this is \Q$^V\E, stopped/,
+                 "no $version");
+       } else {
+           # future
+           is ($@, '', "no $version");
+       }
+    }
 }
+