integrate cfgperl contents into mainline

p4raw-id: //depot/perl@4303

6 files changed, 22 insertions, 3 deletions

diff --git a/t/lib/fields.t b/t/lib/fields.t
index 6f3ea5bb48..da874d674e 100755
--- a/t/lib/fields.t
+++ b/t/lib/fields.t
@@ -106,7 +106,7 @@ print "ok ", ++$testno, "\n";
 
 # We should get compile time failures field name typos
 eval q(my D3 $obj3 = $obj2; $obj3->{notthere} = "");
-print "not " unless $@ && $@ =~ /^No such field "notthere"/;
+print "not " unless $@ && $@ =~ /^No such pseudo-hash field "notthere"/;
 print "ok ", ++$testno, "\n";
 
 #fields::_dump();
diff --git a/t/lib/syslfs.t b/t/lib/syslfs.t
index a8a7a0cde2..43e66feb59 100644
--- a/t/lib/syslfs.t
+++ b/t/lib/syslfs.t
@@ -116,6 +116,12 @@ unless($syswrite && $close) {
 
 print "# @s\n";
 
+unless ($s[7] == 5_000_000_003) {
+    print "1..0\n# not configured to use large files?\n";
+    explain();
+    bye();
+}
+
 sub fail () {
     print "not ";
     $fail++;
diff --git a/t/op/lfs.t b/t/op/lfs.t
index 6f252312ab..87060e74c6 100644
--- a/t/op/lfs.t
+++ b/t/op/lfs.t
@@ -120,6 +120,12 @@ unless ($print && $close) {
 
 print "# @s\n";
 
+unless ($s[7] == 5_000_000_003) {
+    print "1..0\n# not configured to use large files?\n";
+    explain();
+    bye();
+}
+
 sub fail () {
     print "not ";
     $fail++;
diff --git a/t/op/pat.t b/t/op/pat.t
index 89cc2bb0a9..f36394edc2 100755
--- a/t/op/pat.t
+++ b/t/op/pat.t
@@ -4,7 +4,7 @@
 # the format supported by op/regexp.t.  If you want to add a test
 # that does fit that format, add it to op/re_tests, not here.
 
-print "1..192\n";
+print "1..193\n";
 
 BEGIN {
     chdir 't' if -d 't';
@@ -887,3 +887,9 @@ pos=1;
 m/^-.*bb/mg and print "not ";
 print "ok $test\n";
 $test++;
+
+$text = "aaXbXcc";
+pos($text)=0;
+$text =~ /\GXb*X/g and print 'not ';
+print "ok $test\n";
+$test++;
diff --git a/t/op/re_tests b/t/op/re_tests
index b35e964dc1..695672da71 100644
--- a/t/op/re_tests
+++ b/t/op/re_tests
@@ -739,3 +739,4 @@ tt+$	xxxtt	y	-	-
 [\w-z]	-	c	-	/[\w-z]/: invalid [] range in regexp
 [0-[:digit:]]	-	c	-	/[0-[:digit:]]/: invalid [] range in regexp
 [[:digit:]-9]	-	c	-	/[[:digit:]-9]/: invalid [] range in regexp
+\GX.*X	aaaXbX	n	-	-
diff --git a/t/pragma/constant.t b/t/pragma/constant.t
index 15ce319c02..a56e081083 100755
--- a/t/pragma/constant.t
+++ b/t/pragma/constant.t
@@ -151,7 +151,7 @@ print CHASH->{foo};
 print CARRAY->[1];
 print CPHASH->{foo};
 eval q{ CPHASH->{bar} };
-test 44, scalar($@ =~ /^No such array/);
+test 44, scalar($@ =~ /^No such pseudo-hash field/);
 print CCODE->(45);
 eval q{ CCODE->{foo} };
 test 46, scalar($@ =~ /^Constant is not a HASH/);