From 14d53417879256044c40b2ef8d0aa32b1f215acb Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 18 Sep 2013 10:52:51 +0200
Subject: fix test concurrency

---
 ext/phar/tests/phar_buildfromdirectory5.phpt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'ext/phar/tests/phar_buildfromdirectory5.phpt')

diff --git a/ext/phar/tests/phar_buildfromdirectory5.phpt b/ext/phar/tests/phar_buildfromdirectory5.phpt
index 51e5cec691..f20c52ab91 100644
--- a/ext/phar/tests/phar_buildfromdirectory5.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory5.phpt
@@ -8,14 +8,14 @@ phar.readonly=0
 --FILE--
 <?php
 
-mkdir(dirname(__FILE__).'/testdir');
+mkdir(dirname(__FILE__).'/testdir5');
 foreach(range(1, 4) as $i) {
-    file_put_contents(dirname(__FILE__)."/testdir/file$i.txt", "some content for file $i");
+    file_put_contents(dirname(__FILE__)."/testdir5/file$i.txt", "some content for file $i");
 }
 
 try {
-	$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
-	$a = $phar->buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.txt/');
+	$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory5.phar');
+	$a = $phar->buildFromDirectory(dirname(__FILE__) . '/testdir5', '/\.txt/');
 	asort($a);
 	var_dump($a);
 } catch (Exception $e) {
@@ -23,28 +23,28 @@ try {
 	echo $e->getMessage() . "\n";
 }
 
-var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory.phar'));
+var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory5.phar'));
 
 ?>
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/buildfromdirectory.phar');
+unlink(dirname(__FILE__) . '/buildfromdirectory5.phar');
 foreach(range(1, 4) as $i) {
-    unlink(dirname(__FILE__) . "/testdir/file$i.txt");
+    unlink(dirname(__FILE__) . "/testdir5/file$i.txt");
 }
-rmdir(dirname(__FILE__) . '/testdir');
+rmdir(dirname(__FILE__) . '/testdir5');
 ?>
 --EXPECTF--
 array(4) {
   ["file1.txt"]=>
-  string(%d) "%stestdir%cfile1.txt"
+  string(%d) "%stestdir5%cfile1.txt"
   ["file2.txt"]=>
-  string(%d) "%stestdir%cfile2.txt"
+  string(%d) "%stestdir5%cfile2.txt"
   ["file3.txt"]=>
-  string(%d) "%stestdir%cfile3.txt"
+  string(%d) "%stestdir5%cfile3.txt"
   ["file4.txt"]=>
-  string(%d) "%stestdir%cfile4.txt"
+  string(%d) "%stestdir5%cfile4.txt"
 }
 bool(true)
 ===DONE===
-- 
cgit v1.2.1