From a7251e41914c5b24c27ed2669fce2a802a052c05 Mon Sep 17 00:00:00 2001
From: mlugg <mlugg@mlugg.co.uk>
Date: Sat, 13 Sep 2025 16:22:44 +0100
Subject: [PATCH] ci: bump unit test timeouts

---
 ci/riscv64-linux-debug.sh     | 2 +-
 ci/riscv64-linux-release.sh   | 2 +-
 ci/x86_64-linux-debug-llvm.sh | 2 +-
 ci/x86_64-linux-debug.sh      | 2 +-
 ci/x86_64-linux-release.sh    | 2 +-
 ci/x86_64-windows-debug.ps1   | 2 +-
 ci/x86_64-windows-release.ps1 | 2 +-
 lib/std/Build/Step/Run.zig    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/riscv64-linux-debug.sh b/ci/riscv64-linux-debug.sh
index f8bc19dd9a..98bc72a439 100755
--- a/ci/riscv64-linux-debug.sh
+++ b/ci/riscv64-linux-debug.sh
@@ -52,4 +52,4 @@ stage3-debug/bin/zig build test-cases test-modules test-unit test-c-abi test-sta
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
-  --test-timeout-ms 60_000
+  --test-timeout-ms 120_000
diff --git a/ci/riscv64-linux-release.sh b/ci/riscv64-linux-release.sh
index 03e4d08fc9..4622277699 100755
--- a/ci/riscv64-linux-release.sh
+++ b/ci/riscv64-linux-release.sh
@@ -52,4 +52,4 @@ stage3-release/bin/zig build test-cases test-modules test-unit test-c-abi test-s
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
-  --test-timeout-ms 60_000
+  --test-timeout-ms 120_000
diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh
index ce83ce3ed3..560ca74ead 100755
--- a/ci/x86_64-linux-debug-llvm.sh
+++ b/ci/x86_64-linux-debug-llvm.sh
@@ -62,4 +62,4 @@ stage3-debug/bin/zig build test docs \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   -Denable-superhtml \
-  --test-timeout-ms 60_000
+  --test-timeout-ms 240_000
diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh
index b402396a1d..663c8f834a 100755
--- a/ci/x86_64-linux-debug.sh
+++ b/ci/x86_64-linux-debug.sh
@@ -62,4 +62,4 @@ stage3-debug/bin/zig build test docs \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   -Denable-superhtml \
-  --test-timeout-ms 60_000
+  --test-timeout-ms 240_000
diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh
index b7b593a0c8..fb91d69330 100755
--- a/ci/x86_64-linux-release.sh
+++ b/ci/x86_64-linux-release.sh
@@ -64,7 +64,7 @@ stage3-release/bin/zig build test docs \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   -Denable-superhtml \
-  --test-timeout-ms 60_000
+  --test-timeout-ms 240_000
 
 # Ensure that stage3 and stage4 are byte-for-byte identical.
 stage3-release/bin/zig build \
diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1
index 445a55f35e..516a8e3444 100644
--- a/ci/x86_64-windows-debug.ps1
+++ b/ci/x86_64-windows-debug.ps1
@@ -60,7 +60,7 @@ Write-Output "Main test suite..."
   -Dskip-non-native `
   -Dskip-release `
   -Denable-symlinks-windows `
-  --test-timeout-ms 60_000
+  --test-timeout-ms 240_000
 CheckLastExitCode
 
 Write-Output "Build x86_64-windows-msvc behavior tests using the C backend..."
diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1
index 226e2d8ea1..80568eeb37 100644
--- a/ci/x86_64-windows-release.ps1
+++ b/ci/x86_64-windows-release.ps1
@@ -59,7 +59,7 @@ Write-Output "Main test suite..."
   -Dstatic-llvm `
   -Dskip-non-native `
   -Denable-symlinks-windows `
-  --test-timeout-ms 60_000
+  --test-timeout-ms 240_000
 CheckLastExitCode
 
 # Ensure that stage3 and stage4 are byte-for-byte identical.
diff --git a/lib/std/Build/Step/Run.zig b/lib/std/Build/Step/Run.zig
index 52d1a72649..9a3c1f7906 100644
--- a/lib/std/Build/Step/Run.zig
+++ b/lib/std/Build/Step/Run.zig
@@ -1814,7 +1814,7 @@ fn pollZigTest(
     // test. For instance, if the test runner leaves this much time between us requesting a test to
     // start and it acknowledging the test starting, we terminate the child and raise an error. This
     // *should* never happen, but could in theory be caused by some very unlucky IB in a test.
-    const response_timeout_ns = 30 * std.time.ns_per_s;
+    const response_timeout_ns = options.unit_test_timeout_ns orelse 60 * std.time.ns_per_s;
 
     const stdout = poller.reader(.stdout);
     const stderr = poller.reader(.stderr);