summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram <perl-rt@wizbit.be>2008-08-10 22:29:07 +0200
committerNicholas Clark <nick@ccl4.org>2008-08-10 20:27:38 +0000
commita13fba344ba4e4964ffc44249a610a56dd386eff (patch)
tree00a02223cfcb93fffb67b7a3510695b747935d2e
parente0ef849f913cc5b7d5997302b848daf4921ed4c8 (diff)
downloadperl-a13fba344ba4e4964ffc44249a610a56dd386eff.tar.gz
Re: Change 34175: Avoid a potential testing race condition in Shell.pm's test.
Message-ID: <20080810202907.0pfnzshsoco8owg4@horde.wizbit.be> Date: Sun, 10 Aug 2008 20:29:07 +0200 p4raw-id: //depot/perl@34195
-rw-r--r--lib/Shell.t9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/Shell.t b/lib/Shell.t
index 23c1e0e6bf..13bba2255e 100644
--- a/lib/Shell.t
+++ b/lib/Shell.t
@@ -44,7 +44,10 @@ $Shell::capture_stderr = 0;
# Trying to do two repeated C<ls>s in t in core and expecting the same output
# is a race condition when tests are running in parallel, and using it as a
# temporary directory. So go somewhere quieter.
-chdir 'uni' if $ENV{PERL_CORE} && -d 'uni';
+if ($ENV{PERL_CORE} && -d 'uni') {
+ chdir 'uni';
+ $chdir++;
+}
# someone will have to fill in the blanks for other platforms
@@ -75,3 +78,7 @@ if ($Is_VMS) {
}
open(STDERR, ">&SAVERR") ;
+
+if ($chdir) {
+ chdir "..";
+}