Integrate:

[ 22186]
Add a new test file for situations where threads may interfere.
Subject: Re: "restricted hashes" hit again !
From: Stas Bekman <stas@stason.org>
Date: Tue, 23 Dec 2003 15:32:26 -0800
Message-ID: <3FE8D08A.4090806@stason.org>

[ 25920]
Coverage stats showed that there were no tests for taking a slice
from ().

[ 25922]
Tests for index/rindex with empty search string,
adapted from a patch by Rick Delaney

[ 25949]
Lowercase barewords considered harmful to your health.

[ 25950]
Ambiguous test cases may be hazardous to your health.

[ 25965]
Test case should not execute /no_such_process if it does exist.

[ 25967]
Clean up some test files.

[ 25974]
Add appropriate skips to t/io/fs.t to fix test failures on Cygwin.

[ 26045]
From: SADAHIRO Tomoyuki <bqw10602@nifty.com>
Subject: Re: A surprising segfault
Date: Tue, 08 Nov 2005 23:36:13 +0900
Message-Id: <20051108233535.735D.BQW10602@nifty.com>

[ 26079]
Subject: [PATCH] Suppress leaked warnings in ExtUtils tests
From: Dominic Dunlop <domo@computer.org>
Date: Thu, 10 Nov 2005 18:10:00 +0100
Message-Id: <D2949A21-7EE3-449F-BEF2-38FAD7B4A483@computer.org>

[ 26183]
Thread failures on AIX (and others) caused by interleaved output

Subject: Smoke [5.9.3] 26168 FAIL(X) AIX 4.3.3.0/ML11 (PPC/1 cpu)
From: "H.Merijn Brand" <h.m.brand@xs4all.nl>
Date: Sun, 20 Nov 2005 14:36 +0100
Message-Id: <200511201337.jAKDbc1O066213@smtp-vbr6.xs4all.nl>

[ 26186]
Subject: patch@26180 - t/op/array.t : Can't reset %ENV on VMS
From: "John E. Malmberg" <wb8tyw@qsl.net>
Date: Mon, 21 Nov 2005 21:19:31 -0500
Message-ID: <43828033.9040708@qsl.net>

[ 26187]
Subject: patch@26180 - t/op/pat.t : Can't reset %ENV on VMS
From: "John E. Malmberg" <wb8tyw@qsl.net>
Date: Mon, 21 Nov 2005 22:09:17 -0500
Message-ID: <43828BDD.7080302@qsl.net>

[ 26197]
Note the URL describing the vast riches awaiting us.

[ 26323]
Move the $data and $result munging into the test preparation loop.

[ 26324]
Move the rest of the data munging into the test preparation loop.

[ 26398]
TODO-SKIP tests must be "not ok", or else the test harness will think
it's an unexpected success

Subject: Re: Change 26165 broke ext/threads/t/stress_re.t test on Win32 (and patch to t/test.pl and/or Test::Harness)
From: demerphq <demerphq@gmail.com>
Date: Sat, 17 Dec 2005 17:23:23 +0100
Message-ID: <9b18b3110512170823q1bb2cd27h838b4d4dcdba72c9@mail.gmail.com>

[ 26428]
Remove some hardcoded references to ./perl in tests

[ 26469]
like and unlike weren't reporting failure where correctly in test.pl

[ 26543]
Convert t/op/sleep.t to using test.pl
p4raw-link: @26543 on //depot/perl: f9e4a5e8b675d9f0b82120fd33801982344ad4ca
p4raw-link: @26469 on //depot/perl: 8fb276b815a6ad571450952d0012113a8db9e3f4
p4raw-link: @26428 on //depot/perl: c8d62b7117d70c1e6d3a6c3c41603445934b9a83
p4raw-link: @26398 on //depot/perl: a27e4e7f280a6900800142247279c369dc3b8673
p4raw-link: @26324 on //depot/perl: 57c348a981665d6305f7f38920ab85e57a77ae65
p4raw-link: @26323 on //depot/perl: 0a52d15ba5fbf8c2d2178fca6186b8b527a2e596
p4raw-link: @26197 on //depot/perl: 983d1c140ccc5a6746b60b1d15f8f50901ff7b51
p4raw-link: @26187 on //depot/perl: 1606b0c75b28d460075c09d3a6b2203fda3d6db3
p4raw-link: @26186 on //depot/perl: 14ce8c55775aeffb1a1bfc5e3d60b3e29b1aab67
p4raw-link: @26183 on //depot/perl: 5769096374a9658adfca59be4bba59ad77acf00b
p4raw-link: @26079 on //depot/perl: 6e908d91c0cee96c2ca2c5cfebad8cdcb01a656e
p4raw-link: @26045 on //depot/perl: 1937c63eabbbeefba39986529a3c98e62f3dcab4
p4raw-link: @25974 on //depot/perl: b0fdffbddaf257157ac815b3869f2328fc8ab9a0
p4raw-link: @25967 on //depot/perl: 1031ca5cb29f226276d55908e55745187e79d1c8
p4raw-link: @25965 on //depot/perl: 38efdb82c659a45925093d890b9a6cb896cb9c47
p4raw-link: @25950 on //depot/perl: 7f6b17e490f2974227b30f0c61ca2e8729fa877f
p4raw-link: @25949 on //depot/perl: d5fc3e7087d5aeade68cb64da300c8b07e550cc2
p4raw-link: @25922 on //depot/perl: 46f1e5955033fcc63907c341337e8cc34722edf0
p4raw-link: @25920 on //depot/perl: 59abd33597c479b9e5620fa06c6c6a9f2917f858
p4raw-link: @22186 on //depot/perl: f935b2f67f1c88a353de5d1c0f7792d9812d8f31

p4raw-id: //depot/maint-5.8/perl@26697
p4raw-branched: from //depot/perl@26696 'branch in' t/op/threads.t
	(@25953..)
p4raw-integrated: from //depot/perl@26696 'copy in' t/io/argv.t
	(@20175..) lib/ExtUtils/t/Manifest.t (@21652..) t/op/sleep.t
	(@23206..) lib/ExtUtils/t/Command.t (@23653..) t/op/index.t
	(@23782..) t/io/dup.t (@25139..) t/op/chop.t (@25158..)
	t/op/magic.t (@25336..) t/io/crlf_through.t t/io/through.t
	(@25618..) t/test.pl (@26398..) 'edit in' t/op/closure.t
	(@25284..) 'merge in' t/run/runenv.t (@22741..) t/op/array.t
	(@25808..) t/io/print.t (@25973..) t/op/sort.t (@25992..)
p4raw-integrated: from //depot/perl@26323 'edit in' t/op/sprintf.t
	(@26321..)
p4raw-integrated: from //depot/perl@26197 'merge in' t/lib/1_compile.t
	(@22948..)
p4raw-integrated: from //depot/perl@26187 'merge in' t/op/pat.t
	(@25998..)
p4raw-integrated: from //depot/perl@25974 'edit in' t/io/fs.t
	(@25951..)
p4raw-integrated: from //depot/perl@25967 'copy in' t/io/layers.t
	(@24764..)
p4raw-integrated: from //depot/perl@25965 'copy in' t/io/pipe.t
	(@13535..)
p4raw-integrated: from //depot/perl@25920 'ignore' t/op/list.t
	(@23145..)
p4raw-integrated: from //depot/perl@22186 'merge in' MANIFEST
	(@22168..)

1 files changed, 11 insertions, 2 deletions

diff --git a/t/op/pat.t b/t/op/pat.t
index b4e3f5ee5c..5ba099fde3 100755
--- a/t/op/pat.t
+++ b/t/op/pat.t
@@ -81,12 +81,21 @@ $XXX{345} = 345;
 while ($_ = shift(@XXX)) {
     ?(.*)? && (print $1,"\n");
     /not/ && reset;
-    /not ok 26/ && reset 'X';
+    if (/not ok 26/) {
+      if ($^O eq 'VMS') {
+	$_ = shift(@XXX);
+      }
+      else {
+	reset 'X';
+      }
+   }
 }
 
-while (($key,$val) = each(%XXX)) {
+if ($^O ne 'VMS') {
+  while (($key,$val) = each(%XXX)) {
     print "not ok 27\n";
     exit;
+  }
 }
 
 print "ok 27\n";