Fix file clashes in copy tests

Create the "*" file in a sub-directory rather than the main test
directory, so that it's different for each test.

diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt
index 9321c1d9a9dc1c0fecd811f36798bf1c1ef57af1..b6e8a266848302ba3f5a1250649512688f13554d 100644 (file)
--- a/ext/standard/tests/file/copy_variation16-win32.phpt
+++ b/ext/standard/tests/file/copy_variation16-win32.phpt
@@ -41,7 +41,7 @@ $dests = array(
   "$sub_dir/../copy_copy_variation16.tmp",
   "$sub_dir/../copy_variation16_sub/copy_copy_variation16.tmp",
   "$sub_dir/..///../copy_copy_variation16.tmp",
-  "$sub_dir/..///../*",
+  "$sub_dir///../*",
   "$dirname_with_blank/copy_copy_variation16.tmp"
 );
 

diff --git a/ext/standard/tests/file/copy_variation16.phpt b/ext/standard/tests/file/copy_variation16.phpt
index e594aa244ba734531d1109a34eab0a2ae5d9dca3..cc01f1c534d0369965d547de223fb3f1badb9739 100644 (file)
--- a/ext/standard/tests/file/copy_variation16.phpt
+++ b/ext/standard/tests/file/copy_variation16.phpt
@@ -41,7 +41,7 @@ $dests = array(
   "$sub_dir/../copy_copy_variation16.tmp",
   "$sub_dir/../copy_variation16_sub/copy_copy_variation16.tmp",
   "$sub_dir/..///../copy_copy_variation16.tmp",
-  "$sub_dir/..///../*",
+  "$sub_dir///../*",
   "$dirname_with_blank/copy_copy_variation16.tmp"
 );
 
@@ -130,7 +130,7 @@ Size of destination file => int(3500)
 Size of source file => int(3500)
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name is => %s/copy_variation16/copy_variation16_sub/..///../*
+Destination file name is => %s/copy_variation16/copy_variation16_sub///../*
 Size of destination file => int(3500)
 
 -- Iteration 8 --

diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt
index ce2dc89f99f008d9ce674ee7962180446f21fa7f..59a82236d28617fa6ecd24c4f03bfe93b2a71b2b 100644 (file)
--- a/ext/standard/tests/file/copy_variation6-win32.phpt
+++ b/ext/standard/tests/file/copy_variation6-win32.phpt
@@ -39,7 +39,7 @@ $dests = array(
   "$sub_dir/../copy_copy_variation6.tmp",
   "$sub_dir/../copy_variation6_sub/copy_copy_variation6.tmp",
   "$sub_dir/..///../copy_copy_variation6.tmp",
-  "$sub_dir/..///../*",
+  "$sub_dir///../*",
   "$dirname_with_blank/copy_copy_variation6.tmp"
 );
 
@@ -129,7 +129,7 @@ Size of destination file => int(0)
 
 -- Iteration 7 --
 Copy operation => 
-Warning: copy(%s/copy_variation6/copy_variation6_sub/..///../*): failed to open stream: No such file or directory in %s on line %d
+Warning: copy(%s/copy_variation6/copy_variation6_sub///../*): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 Existence of destination file => bool(false)
 

diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt
index 2e7ffd64d407aa6583ca3df591676fb10c01b647..c505cb77ecfae2173e147af57828f415d379458f 100644 (file)
--- a/ext/standard/tests/file/copy_variation6.phpt
+++ b/ext/standard/tests/file/copy_variation6.phpt
@@ -39,7 +39,7 @@ $dests = array(
   "$sub_dir/../copy_copy_variation6.tmp",
   "$sub_dir/../copy_variation6_sub/copy_copy_variation6.tmp",
   "$sub_dir/..///../copy_copy_variation6.tmp",
-  "$sub_dir/..///../*",
+  "$sub_dir///../*",
   "$dirname_with_blank/copy_copy_variation6.tmp"
 );
 
@@ -128,7 +128,7 @@ Size of destination file => int(0)
 -- Iteration 7 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name is => %s/copy_variation6/copy_variation6_sub/..///../*
+Destination file name is => %s/copy_variation6/copy_variation6_sub///../*
 Size of source file => int(0)
 Size of destination file => int(0)
 

diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt
index ebad6e2c4ec75c07de4cf83d1623660a97bb70f1..dc69a27b336a6947dce24beabd92a3cabb21cc41 100644 (file)
--- a/ext/standard/tests/file/copy_variation8.phpt
+++ b/ext/standard/tests/file/copy_variation8.phpt
@@ -42,7 +42,7 @@ $dests = array(
   "$sub_dir/../copy_copy_variation8.tmp",
   "$sub_dir/../copy_variation8_sub/copy_copy_variation8.tmp",
   "$sub_dir/..///../copy_copy_variation8.tmp",
-  "$sub_dir/..///../*",
+  "$sub_dir///../*",
   "$dirname_with_blank/copy_copy_variation8.tmp"
 );