Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5043

3 files changed, 35 insertions, 19 deletions

diff --git a/t/comp/use.t b/t/comp/use.t
index 1099547393..2594f0a547 100755
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -44,9 +44,7 @@ unless ($@) {
 print "ok ",$i++,"\n";
 
 
-
-use lib; # I know that this module will be there.
-
+{ use lib }	# check that subparse saves pending tokens
 
 local $lib::VERSION = 1.0;
 
diff --git a/t/op/ver.t b/t/op/ver.t
new file mode 100755
index 0000000000..e05264682c
--- /dev/null
+++ b/t/op/ver.t
@@ -0,0 +1,33 @@
+#!./perl
+
+BEGIN {
+    chdir 't' if -d 't';
+    unshift @INC, "../lib";
+}
+
+print "1..6\n";
+
+my $test = 1;
+
+use v5.5.640;
+require v5.5.640;
+print "ok $test\n";  ++$test;
+
+print "not " unless v1.20.300.4000 eq "\x{1}\x{14}\x{12c}\x{fa0}";
+print "ok $test\n";  ++$test;
+
+print "not " unless v1.20.300.4000 > 1.0203039 and v1.20.300.4000 < 1.0203041;
+print "ok $test\n";  ++$test;
+
+print "not " unless sprintf("%v", "Perl") eq '80.101.114.108';
+print "ok $test\n";  ++$test;
+
+print "not " unless sprintf("%v", v1.22.333.4444) eq '1.22.333.4444';
+print "ok $test\n";  ++$test;
+
+{
+    use byte;
+    print "not " unless
+        sprintf("%v", v1.22.333.4444) eq '1.22.197.141.225.133.156';
+    print "ok $test\n";  ++$test;
+}
diff --git a/t/pragma/warn/toke b/t/pragma/warn/toke
index 515241ab4d..48f97dd10c 100644
--- a/t/pragma/warn/toke
+++ b/t/pragma/warn/toke
@@ -89,10 +89,6 @@ toke.c	AOK
 	sub time {} 
 	my $a = time()
 
-    Use of \\x{} without utf8 declaration
-	$_ = " \x{123} " ;
-
-
     \x%.*s will produce malformed UTF-8 character; use \x{%.*s} for that
         use utf8 ; 
 	$_ = "\xffe"
@@ -440,18 +436,7 @@ EXPECT
 Ambiguous call resolved as CORE::time(), qualify as such or use & at - line 4.
 ########
 # toke.c
-use warnings 'utf8' ;
-eval <<'EOE';
-{
-#line 30 "foo"
-  $_ = " \x{123} " ;
-}
-EOE
-EXPECT
-Use of \x{} without utf8 declaration at foo line 30.
-########
-# toke.c
-no warnings 'utf8' ;
+use warnings ;
 eval <<'EOE';
 {
 #line 30 "foo"