From 88ecbb555e63d23d4f4adb56437b7ed53724abb6 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Mon, 27 Mar 2023 12:50:29 +0200
Subject: [PATCH] Unparallelize IO heavy tests

Alternative to GH-10892. This is somewhat unfortunate since these are also the
slow tests. I'm also not sure if this actually helps.
---
 ext/mysqli/tests/mysqli_fetch_array_large.phpt | 2 ++
 ext/mysqli/tests/mysqli_stmt_bind_limits.phpt  | 2 ++
 ext/oci8/tests/CONFLICTS                       | 3 ++-
 ext/pdo_oci/tests/CONFLICTS                    | 3 ++-
 ext/standard/tests/file/bug81145.phpt          | 2 ++
 ext/tidy/tests/parsing_file_too_large.phpt     | 2 ++
 sapi/cli/tests/upload_2G.phpt                  | 2 ++
 7 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ext/mysqli/tests/mysqli_fetch_array_large.phpt b/ext/mysqli/tests/mysqli_fetch_array_large.phpt
index 43cd0fab3fd92..21b74e8ab7ae6 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_large.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_large.phpt
@@ -7,6 +7,8 @@ mysqli
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 require_once('skipifconnectfailure.inc');
 ?>
+--CONFLICTS--
+all
 --INI--
 memory_limit=-1
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
index 58a99c86e7f47..03a980d929c6e 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
@@ -6,6 +6,8 @@ mysqli
 <?php
 require_once('skipifconnectfailure.inc');
 ?>
+--CONFLICTS--
+all
 --FILE--
 <?php
     require_once("connect.inc");
diff --git a/ext/oci8/tests/CONFLICTS b/ext/oci8/tests/CONFLICTS
index 176b41ab8bb6f..ff6afc6fb0838 100644
--- a/ext/oci8/tests/CONFLICTS
+++ b/ext/oci8/tests/CONFLICTS
@@ -1 +1,2 @@
-oci8
+# OCI tests are network intensive and may cause timeouts in other tests
+all
diff --git a/ext/pdo_oci/tests/CONFLICTS b/ext/pdo_oci/tests/CONFLICTS
index 176b41ab8bb6f..ff6afc6fb0838 100644
--- a/ext/pdo_oci/tests/CONFLICTS
+++ b/ext/pdo_oci/tests/CONFLICTS
@@ -1 +1,2 @@
-oci8
+# OCI tests are network intensive and may cause timeouts in other tests
+all
diff --git a/ext/standard/tests/file/bug81145.phpt b/ext/standard/tests/file/bug81145.phpt
index ea498b493ee7d..f3258ff6019e9 100644
--- a/ext/standard/tests/file/bug81145.phpt
+++ b/ext/standard/tests/file/bug81145.phpt
@@ -13,6 +13,8 @@ if (PHP_OS_FAMILY !== "Windows") {
     @unlink(__DIR__ . "/bug81145_src.bin");
 }
 ?>
+--CONFLICTS--
+all
 --FILE--
 <?php
 $src = __DIR__ . "/bug81145_src.bin";
diff --git a/ext/tidy/tests/parsing_file_too_large.phpt b/ext/tidy/tests/parsing_file_too_large.phpt
index abc64d5c17c37..25829bf4e9595 100644
--- a/ext/tidy/tests/parsing_file_too_large.phpt
+++ b/ext/tidy/tests/parsing_file_too_large.phpt
@@ -8,6 +8,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (getenv("SKIP_ASAN")) die("skip too big for asan");
 ?>
+--CONFLICTS--
+all
 --INI--
 memory_limit="5G"
 --FILE--
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index 7ca9177229191..1cf883cd9d3aa 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -42,6 +42,8 @@ if (getenv('SKIP_PERF_SENSITIVE')) {
     die("skip Test may be very slow if PHP is instrumented");
 }
 ?>
+--CONFLICTS--
+all
 --FILE--
 <?php