Item9312: Don't die on cwd change

git-svn-id: http://svn.foswiki.org/trunk@8160 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jul 13, 2010 · b378c12 · b378c12
1 parent 3c019ac
commit b378c12
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/UnitTestContrib/lib/Unit/TestRunner.pm b/UnitTestContrib/lib/Unit/TestRunner.pm
@@ -39,7 +39,7 @@ sub start {
     @{ $this->{initialINC} } = @INC;
     my $passes = 0;
 
-    my $start_cwd = Cwd->cwd();
+    my ($start_cwd) = Cwd->cwd() =~ m/^(.*)$/;
     print "Starting CWD is $start_cwd \n";
 
     # First use all the tests to get them compiled
@@ -130,7 +130,11 @@ sub start {
                 $action = runOne( $tester, $suite, $testToRun );
             }
 
-            die "CWD changed to " . Cwd->cwd() . " by previous test!! \n" if ( Cwd->cwd() ne $start_cwd) ;
+            if ( Cwd->cwd() ne $start_cwd) {
+                print "CWD changed to " . Cwd->cwd() 
+                  . " by previous test!! \n";
+                chdir $start_cwd or die "Cannot change back to previous $start_cwd\n";
+                }
 
             # untaint action for the case where the test is run in
             # another process