Integrate mainline

[p5sagit/p5-mst-13.2.git] / t / op / ver.t

diff --git a/t/op/ver.t b/t/op/ver.t
index 4ccc84c..1dc28d2 100755 (executable)
--- a/t/op/ver.t
+++ b/t/op/ver.t
@@ -2,7 +2,7 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib';
+    @INC = qw(. ../lib);
     $SIG{'__WARN__'} = sub { warn $_[0] if $DOWARN };
 }
 
@@ -11,8 +11,8 @@ $DOWARN = 1; # enable run-time warnings now
 use Config;
 $tests = $Config{'uvsize'} == 8 ? 47 : 44;
 
-require Test::More;
-Test::More->import( tests => $tests );
+require "test.pl";
+plan( tests => $tests );
 
 eval { use v5.5.640; };
 is( $@, '', "use v5.5.640; $@");
@@ -32,7 +32,7 @@ else { # EBCDIC
 
     # hash keys too
     $h{v150.146} = "ok";
-    is('ok',$h{v111.107},'ASCII hash keys');
+    is('ok',$h{v150.146},'EBCDIC hash keys');
 }
 
 # poetry optimization should also
@@ -185,13 +185,13 @@ eval { require Socket; gethostbyaddr(v127.0.0.1, Socket::AF_INET) };
 if ($@) {
     # No - so do not test insane fails.
     $@ =~ s/\n/\n# /g;
-    skip("No Socket::AF_INET # $@");
 }
-else {
+SKIP: {
+    skip("No Socket::AF_INET # $@") if $@;
     my $ip   = v2004.148.0.1;
     my $host;
     eval { $host = gethostbyaddr($ip,Socket::AF_INET) };
-    ok($@ =~ /Wide character/,"Non-bytes leak to gethostbyaddr");
+    like($@, qr/Wide character/, "Non-bytes leak to gethostbyaddr");
 }
 
 # Chapter 28, pp671
@@ -208,7 +208,7 @@ my ($revision,$version,$subversion) = split '\.', sprintf("%vd",$^V);
 
 my $v = sprintf("%d.%.3d%.3d",$revision,$version,$subversion);
 
-ok( $v eq "$]", "\$^V eq \$] (string)");
+ok( $v eq "$]", qq{"\$^V eq "\$]"});
 
 $v = $revision + $version/1000 + $subversion/1000000;