X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcomp%2Fuse.t;h=c9b76d79a444d5c98d93d229c03ac98545bd12fe;hb=1809c940bf4737dd262fc0c026e063316c466a28;hp=d3a3568c1c2029f39cd8c1caaa88b57bf425d26a;hpb=2d90ac9586ffb5c785730411e7c6e986a8a1190c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/comp/use.t b/t/comp/use.t
index d3a3568..c9b76d7 100755
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -2,11 +2,11 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib';
+    @INC = ('../lib', 'lib');
     $INC{"feature.pm"} = 1; # so we don't attempt to load feature.pm
 }
 
-print "1..63\n";
+print "1..73\n";
 
 # Can't require test.pl, as we're testing the use/require mechanism here.
 
@@ -37,7 +37,7 @@ sub _ok {
 	} else {
 	    print "not ok $test\n";
 	}
-	my @caller = caller(2);
+	my @caller = caller(1);
 	print "# Failed test at $caller[1] line $caller[2]\n";
 	print "# Got      '$got'\n";
 	if ($type eq 'is') {
@@ -62,6 +62,26 @@ sub isnt ($$;$) {
     _ok ('isnt', @_);
 }
 
+eval "use 5";           # implicit semicolon
+is ($@, '');
+
+eval "use 5;";
+is ($@, '');
+
+eval "{use 5}";         # [perl #70884]
+is ($@, '');
+
+eval "{use 5   }";      # [perl #70884]
+is ($@, '');
+
+# new style version numbers
+
+eval q{ use v5.5.630; };
+is ($@, '');
+
+eval q{ use 10.0.2; };
+like ($@, qr/^Perl v10\.0\.2 required/);
+
 eval "use 5.000";	# implicit semicolon
 is ($@, '');
 
@@ -89,6 +109,9 @@ like ($@, qr/Perl v5\.900\.0 required \(did you mean v5\.9\.0\?\)--this is only
 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 "use 5.11;";
+like ($@, qr/Perl v5\.110\.0 required \(did you mean v5\.11\.0\?\)--this is only \Q$^V\E, stopped/);
+
 eval sprintf "use %.6f;", $];
 is ($@, '');
 
@@ -102,100 +125,92 @@ like ($@, qr/Perl v6.\d+.\d+ required--this is only \Q$^V\E, stopped/);
 eval sprintf "use %.6f;", $] + 0.00001;
 like ($@, qr/Perl v5.\d+.\d+ required--this is only \Q$^V\E, stopped/);
 
-{ use lib }	# check that subparse saves pending tokens
+# check that "use 5.11.0" (and higher) loads strictures
+eval 'use 5.11.0; ${"foo"} = "bar";';
+like ($@, qr/Can't use string \("foo"\) as a SCALAR ref while "strict refs" in use/);
+# but that they can be disabled
+eval 'use 5.11.0; no strict "refs"; ${"foo"} = "bar";';
+is ($@, "");
+# and they are properly scoped
+eval '{use 5.11.0;} ${"foo"} = "bar";';
+is ($@, "");
 
-local $lib::VERSION = 1.0;
+{ use test_use }	# check that subparse saves pending tokens
 
-eval "use lib 0.9";
+local $test_use::VERSION = 1.0;
+
+eval "use test_use 0.9";
 is ($@, '');
 
-eval "use lib 1.0";
+eval "use test_use 1.0";
 is ($@, '');
 
-eval "use lib 1.01";
+eval "use test_use 1.01";
 isnt ($@, '');
 
-
-eval "use lib 0.9 qw(fred)";
+eval "use test_use 0.9 qw(fred)";
 is ($@, '');
 
-if ($^O eq 'MacOS') {
-    is($INC[0], ":fred:");
-} else {
-    is($INC[0], "fred");
-}
+is("@test_use::got", "fred");
 
-eval "use lib 1.0 qw(joe)";
+eval "use test_use 1.0 qw(joe)";
 is ($@, '');
 
+is("@test_use::got", "joe");
 
-if ($^O eq 'MacOS') {
-    is($INC[0], ":joe:");
-} else {
-    is($INC[0], "joe");
-}
-
-
-eval "use lib 1.01 qw(freda)";
+eval "use test_use 1.01 qw(freda)";
 isnt($@, '');
 
-if ($^O eq 'MacOS') {
-    isnt($INC[0], ":freda:");
-} else {
-    isnt($INC[0], "freda");
-}
+is("@test_use::got", "joe");
 
 {
-    local $lib::VERSION = 35.36;
-    eval "use lib v33.55";
+    local $test_use::VERSION = 35.36;
+    eval "use test_use v33.55";
     is ($@, '');
 
-    eval "use lib v100.105";
-    like ($@, qr/lib version v100.105.0 required--this is only version v35\.360\.0/);
+    eval "use test_use v100.105";
+    like ($@, qr/test_use version v100.105.0 required--this is only version v35\.360\.0/);
 
-    eval "use lib 33.55";
+    eval "use test_use 33.55";
     is ($@, '');
 
-    eval "use lib 100.105";
-    like ($@, qr/lib version 100.105 required--this is only version 35.36/);
+    eval "use test_use 100.105";
+    like ($@, qr/test_use version 100.105 required--this is only version 35.36/);
 
-    local $lib::VERSION = '35.36';
-    eval "use lib v33.55";
+    local $test_use::VERSION = '35.36';
+    eval "use test_use v33.55";
     like ($@, '');
 
-    eval "use lib v100.105";
-    like ($@, qr/lib version v100.105.0 required--this is only version v35\.360\.0/);
+    eval "use test_use v100.105";
+    like ($@, qr/test_use version v100.105.0 required--this is only version v35\.360\.0/);
 
-    eval "use lib 33.55";
+    eval "use test_use 33.55";
     is ($@, '');
 
-    eval "use lib 100.105";
-    like ($@, qr/lib version 100.105 required--this is only version 35.36/);
+    eval "use test_use 100.105";
+    like ($@, qr/test_use version 100.105 required--this is only version 35.36/);
 
-    local $lib::VERSION = v35.36;
-    eval "use lib v33.55";
+    local $test_use::VERSION = v35.36;
+    eval "use test_use v33.55";
     is ($@, '');
 
-    eval "use lib v100.105";
-    like ($@, qr/lib version v100.105.0 required--this is only version v35\.36\.0/);
+    eval "use test_use v100.105";
+    like ($@, qr/test_use version v100.105.0 required--this is only version v35\.36\.0/);
 
-    eval "use lib 33.55";
+    eval "use test_use 33.55";
     is ($@, '');
 
-    eval "use lib 100.105";
-    like ($@, qr/lib version 100.105 required--this is only version v35.36/);
+    eval "use test_use 100.105";
+    like ($@, qr/test_use 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";
-    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";
+    # (git commit 2658f4d9934aba5f8b23afcc078dc12b3a40223)
+    eval "use test_use_14937 3";
+    like ($@, qr/^test_use_14937 defines neither package nor VERSION--version check failed at/);
 }
 
 my @ver = split /\./, sprintf "%vd", $^V;