Skip to content

Commit 04c9c4a

Browse files
committed
Fix intermittent test failures of windows_mb_path tests
Some of these tests create, use and later remove the same folder, so if these are run in parallel, they may fail due to race conditions[1]. As quick fix we add appropriate CONFLICTS clauses to prevent parallel execution of the respective test groups. [1] <https://ci.appveyor.com/project/php/php-src/builds/31213037/job/48rp13i0frf5t9hl#L5480>
1 parent b093bd6 commit 04c9c4a

File tree

80 files changed

+160
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+160
-0
lines changed

ext/standard/tests/file/windows_mb_path/bug71509.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts("zip");
1010

1111
?>
12+
--CONFLICTS--
13+
bug71509
1214
--FILE--
1315
<?PHP
1416
// ĺöä

ext/standard/tests/file/windows_mb_path/test_big5_0.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ skip_if_no_required_exts();
1010
skip_if_wrong_cp(950, "ansi");
1111

1212
?>
13+
--CONFLICTS--
14+
file_big5
1315
--INI--
1416
defalut_charset=big5
1517
--FILE--

ext/standard/tests/file/windows_mb_path/test_big5_1.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ skip_if_no_required_exts();
1010
skip_if_wrong_cp(950, "ansi");
1111

1212
?>
13+
--CONFLICTS--
14+
dir_big5
1315
--INI--
1416
internal_encoding=big5
1517
--FILE--

ext/standard/tests/file/windows_mb_path/test_big5_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ skip_if_no_required_exts();
1010
skip_if_wrong_cp(950, "ansi");
1111

1212
?>
13+
--CONFLICTS--
14+
file_big5
1315
--INI--
1416
defalut_charset=cp950
1517
--FILE--

ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts();
1010

1111
?>
12+
--CONFLICTS--
13+
file_big5
1214
--FILE--
1315
<?php
1416
/*

ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts();
1010

1111
?>
12+
--CONFLICTS--
13+
dir_big5
1214
--FILE--
1315
<?php
1416
/*

ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts();
1010

1111
?>
12+
--CONFLICTS--
13+
file_big5
1214
--FILE--
1315
<?php
1416
/*

ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts();
1010

1111
?>
12+
--CONFLICTS--
13+
file_cp1250
1214
--FILE--
1315
<?php
1416
/*

ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts();
1010

1111
?>
12+
--CONFLICTS--
13+
dir_cp1250
1214
--FILE--
1315
<?php
1416
/*

ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
skip_if_no_required_exts();
1010

1111
?>
12+
--CONFLICTS--
13+
dir_cp1250
1214
--FILE--
1315
<?php
1416
/*

0 commit comments

Comments
 (0)