summaryrefslogtreecommitdiff
path: root/ext/standard/tests/file
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-08-30 16:36:49 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-08-30 16:36:49 +0200
commit1e4cc5bf0bf9ca58683ac16fd56ad68b69c3893a (patch)
treeb2fdbff1d3a9de85bdb5b139312a5c381f992007 /ext/standard/tests/file
parent2f67f32eaa444cbc02e02e8ce797f8cc45563e2a (diff)
downloadphp-git-1e4cc5bf0bf9ca58683ac16fd56ad68b69c3893a.tar.gz
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.
Diffstat (limited to 'ext/standard/tests/file')
-rw-r--r--ext/standard/tests/file/copy_variation16-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation16.phpt4
-rw-r--r--ext/standard/tests/file/copy_variation6-win32.phpt4
-rw-r--r--ext/standard/tests/file/copy_variation6.phpt4
-rw-r--r--ext/standard/tests/file/copy_variation8.phpt2
5 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt
index 9321c1d9a9..b6e8a26684 100644
--- 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 e594aa244b..cc01f1c534 100644
--- 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 ce2dc89f99..59a82236d2 100644
--- 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 2e7ffd64d4..c505cb77ec 100644
--- 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 ebad6e2c4e..dc69a27b33 100644
--- 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"
);