Skip to content

Commit 1e4cc5b

Browse files
committed
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.
1 parent 2f67f32 commit 1e4cc5b

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

ext/standard/tests/file/copy_variation16-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $dests = array(
4141
"$sub_dir/../copy_copy_variation16.tmp",
4242
"$sub_dir/../copy_variation16_sub/copy_copy_variation16.tmp",
4343
"$sub_dir/..///../copy_copy_variation16.tmp",
44-
"$sub_dir/..///../*",
44+
"$sub_dir///../*",
4545
"$dirname_with_blank/copy_copy_variation16.tmp"
4646
);
4747

ext/standard/tests/file/copy_variation16.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $dests = array(
4141
"$sub_dir/../copy_copy_variation16.tmp",
4242
"$sub_dir/../copy_variation16_sub/copy_copy_variation16.tmp",
4343
"$sub_dir/..///../copy_copy_variation16.tmp",
44-
"$sub_dir/..///../*",
44+
"$sub_dir///../*",
4545
"$dirname_with_blank/copy_copy_variation16.tmp"
4646
);
4747

@@ -130,7 +130,7 @@ Size of destination file => int(3500)
130130
Size of source file => int(3500)
131131
Copy operation => bool(true)
132132
Existence of destination file => bool(true)
133-
Destination file name is => %s/copy_variation16/copy_variation16_sub/..///../*
133+
Destination file name is => %s/copy_variation16/copy_variation16_sub///../*
134134
Size of destination file => int(3500)
135135

136136
-- Iteration 8 --

ext/standard/tests/file/copy_variation6-win32.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $dests = array(
3939
"$sub_dir/../copy_copy_variation6.tmp",
4040
"$sub_dir/../copy_variation6_sub/copy_copy_variation6.tmp",
4141
"$sub_dir/..///../copy_copy_variation6.tmp",
42-
"$sub_dir/..///../*",
42+
"$sub_dir///../*",
4343
"$dirname_with_blank/copy_copy_variation6.tmp"
4444
);
4545

@@ -129,7 +129,7 @@ Size of destination file => int(0)
129129

130130
-- Iteration 7 --
131131
Copy operation =>
132-
Warning: copy(%s/copy_variation6/copy_variation6_sub/..///../*): failed to open stream: No such file or directory in %s on line %d
132+
Warning: copy(%s/copy_variation6/copy_variation6_sub///../*): failed to open stream: No such file or directory in %s on line %d
133133
bool(false)
134134
Existence of destination file => bool(false)
135135

ext/standard/tests/file/copy_variation6.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $dests = array(
3939
"$sub_dir/../copy_copy_variation6.tmp",
4040
"$sub_dir/../copy_variation6_sub/copy_copy_variation6.tmp",
4141
"$sub_dir/..///../copy_copy_variation6.tmp",
42-
"$sub_dir/..///../*",
42+
"$sub_dir///../*",
4343
"$dirname_with_blank/copy_copy_variation6.tmp"
4444
);
4545

@@ -128,7 +128,7 @@ Size of destination file => int(0)
128128
-- Iteration 7 --
129129
Copy operation => bool(true)
130130
Existence of destination file => bool(true)
131-
Destination file name is => %s/copy_variation6/copy_variation6_sub/..///../*
131+
Destination file name is => %s/copy_variation6/copy_variation6_sub///../*
132132
Size of source file => int(0)
133133
Size of destination file => int(0)
134134

ext/standard/tests/file/copy_variation8.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $dests = array(
4242
"$sub_dir/../copy_copy_variation8.tmp",
4343
"$sub_dir/../copy_variation8_sub/copy_copy_variation8.tmp",
4444
"$sub_dir/..///../copy_copy_variation8.tmp",
45-
"$sub_dir/..///../*",
45+
"$sub_dir///../*",
4646
"$dirname_with_blank/copy_copy_variation8.tmp"
4747
);
4848

0 commit comments

Comments
 (0)