import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself

3 files changed, 83 insertions, 12 deletions

diff --git a/gnu/usr.bin/perl/cpan/JSON-PP/t/021_evans_bugrep.t b/gnu/usr.bin/perl/cpan/JSON-PP/t/021_evans_bugrep.t
index ecbfcddc1d6..e7d6dc5ed9f 100644
--- a/gnu/usr.bin/perl/cpan/JSON-PP/t/021_evans_bugrep.t
+++ b/gnu/usr.bin/perl/cpan/JSON-PP/t/021_evans_bugrep.t
@@ -32,7 +32,7 @@ eval {
     $j->incr_text;
 };
 
-like( $@, qr/incr_text can ?not be called when the incremental parser already started parsing/ );
+like( $@, qr/incr_text can not be called when the incremental parser already started parsing/ );
 
 $object = $j->incr_parse($parts[1]);
 
diff --git a/gnu/usr.bin/perl/cpan/Locale-Codes/t/language_old.t b/gnu/usr.bin/perl/cpan/Locale-Codes/t/language_old.t
index aa4a1d03d60..217ba267c99 100644
--- a/gnu/usr.bin/perl/cpan/Locale-Codes/t/language_old.t
+++ b/gnu/usr.bin/perl/cpan/Locale-Codes/t/language_old.t
@@ -1,18 +1,90 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
-use warnings;
-use strict;
 require 5.002;
 
-if ( -f "t/do_tests.pl" ) {
-   require "./t/do_tests.pl";
-} elsif (-f "do_tests.pl") {
-   require "./do_tests.pl";
+$runtests=shift(@ARGV);
+if ( -f "t/testfunc.pl" ) {
+  require "t/testfunc.pl";
+  $dir="./lib";
+  $tdir="t";
+} elsif ( -f "testfunc.pl" ) {
+  require "testfunc.pl";
+  $dir="../lib";
+  $tdir=".";
 } else {
-  die "ERROR: cannot find do_tests.pl\n";
+  die "ERROR: cannot find testfunc.pl\n";
 }
 
-do_tests('language','','old');
+unshift(@INC,$dir);
+use Locale::Language;
+
+%type = ( "LOCALE_LANG_ALPHA_2" => LOCALE_LANG_ALPHA_2,
+          "LOCALE_LANG_ALPHA_3" => LOCALE_LANG_ALPHA_3,
+          "LOCALE_LANG_TERM"    => LOCALE_LANG_TERM,
+        );
+
+sub test {
+   my(@test) = @_;
+
+   if      ($test[0] eq "rename_language") {
+      shift(@test);
+      $test[2]  = $type{$test[2]}
+        if (@test == 3  &&  $test[2]  &&  exists $type{$test[2]});
+      return Locale::Language::rename_language(@test,"nowarn");
+
+   } elsif ($test[0] eq "add_language") {
+      shift(@test);
+      $test[2]  = $type{$test[2]}
+        if (@test == 3  &&  $test[2]  &&  exists $type{$test[2]});
+      return Locale::Language::add_language(@test,"nowarn");
+
+   } elsif ($test[0] eq "delete_language") {
+      shift(@test);
+      $test[1]  = $type{$test[1]}
+        if (@test == 2  &&  $test[1]  &&  exists $type{$test[1]});
+      return Locale::Language::delete_language(@test,"nowarn");
+
+   } elsif ($test[0] eq "add_language_alias") {
+      shift(@test);
+      return Locale::Language::add_language_alias(@test,"nowarn");
+
+   } elsif ($test[0] eq "delete_language_alias") {
+      shift(@test);
+      return Locale::Language::delete_language_alias(@test,"nowarn");
+
+   } elsif ($test[0] eq "language2code") {
+      shift(@test);
+      $test[1]  = $type{$test[1]}
+        if (@test == 2  &&  $test[1]  &&  exists $type{$test[1]});
+      return language2code(@test);
+
+   } else {
+      $test[1]  = $type{$test[1]}
+        if (@test == 2  &&  $test[1]  &&  exists $type{$test[1]});
+      return code2language(@test);
+   }
+}
+
+$tests = "
+
+zu ~ Zulu
+
+rename_language zu NewName LOCALE_LANG_FOO ~ 0
+
+rename_language zu English LOCALE_LANG_ALPHA_2 ~ 0
+
+rename_language zu NewName LOCALE_LANG_ALPHA_3 ~ 0
+
+zu ~ Zulu
+
+rename_language zu NewName LOCALE_LANG_ALPHA_2 ~ 1
+
+zu ~ NewName
+
+";
+
+print "language (old; semi-private)...\n";
+test_Func(\&test,$tests,$runtests);
 
 1;
 # Local Variables:
@@ -23,5 +95,5 @@ do_tests('language','','old');
 # cperl-continued-brace-offset: 0
 # cperl-brace-offset: 0
 # cperl-brace-imaginary-offset: 0
-# cperl-label-offset: 0
+# cperl-label-offset: -2
 # End:
diff --git a/gnu/usr.bin/perl/ext/arybase/t/scope.t b/gnu/usr.bin/perl/ext/arybase/t/scope.t
index 5fca19610c3..07b41769779 100644
--- a/gnu/usr.bin/perl/ext/arybase/t/scope.t
+++ b/gnu/usr.bin/perl/ext/arybase/t/scope.t
@@ -30,7 +30,6 @@ is $t[3], "a";
 	is $t[3], "e";
 }
 is $t[3], "a";
-BEGIN { push @INC, '.' }
 use t::scope_0;
 is scope0_test(), "d";