Skip to content

Commit 9b15537

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Unparallelize IO heavy tests
2 parents 22040f5 + e1ec67a commit 9b15537

File tree

8 files changed

+16
-2
lines changed

8 files changed

+16
-2
lines changed

ext/mysqli/tests/mysqli_fetch_array_large.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ mysqli
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
88
require_once('skipifconnectfailure.inc');
99
?>
10+
--CONFLICTS--
11+
all
1012
--INI--
1113
memory_limit=-1
1214
--FILE--

ext/mysqli/tests/mysqli_stmt_bind_limits.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ mysqli
66
<?php
77
require_once('skipifconnectfailure.inc');
88
?>
9+
--CONFLICTS--
10+
all
911
--FILE--
1012
<?php
1113
require_once("connect.inc");

ext/oci8/tests/CONFLICTS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
oci8
1+
# OCI tests are network intensive and may cause timeouts in other tests
2+
all

ext/pdo_oci/tests/CONFLICTS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
oci8
1+
# OCI tests are network intensive and may cause timeouts in other tests
2+
all

ext/standard/tests/file/bug81145.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ if (PHP_OS_FAMILY !== "Windows") {
1313
@unlink(__DIR__ . "/bug81145_src.bin");
1414
}
1515
?>
16+
--CONFLICTS--
17+
all
1618
--FILE--
1719
<?php
1820
$src = __DIR__ . "/bug81145_src.bin";

ext/standard/tests/streams/proc_open_bug69900.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #69900 Commandline input/output weird behaviour with STDIO
3+
--CONFLICTS--
4+
all
35
--FILE--
46
<?php
57

ext/tidy/tests/parsing_file_too_large.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
88
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
99
if (getenv("SKIP_ASAN")) die("skip too big for asan");
1010
?>
11+
--CONFLICTS--
12+
all
1113
--INI--
1214
memory_limit="5G"
1315
--FILE--

sapi/cli/tests/upload_2G.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ if (getenv('SKIP_PERF_SENSITIVE')) {
4242
die("skip Test may be very slow if PHP is instrumented");
4343
}
4444
?>
45+
--CONFLICTS--
46+
all
4547
--FILE--
4648
<?php
4749

0 commit comments

Comments
 (0)