From 5fc3904bfe290625ed6cf9b41773b35b52bf72b7 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 16 Oct 2025 11:16:05 +0000
Subject: [PATCH] 8369491: Temporarily revert default TIMEOUT_FACTOR back to 4

Reviewed-by: lkorinth, cstein, jpai, syan, serb, prr
---
 doc/testing.html  | 2 +-
 doc/testing.md    | 2 +-
 make/RunTests.gmk | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/testing.html b/doc/testing.html
index 89a9b1b23b7..b9838735e4f 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -450,7 +450,7 @@ itself (<code>-timeoutFactor</code>). Also, some test cases that
 programmatically wait a certain amount of time will apply this factor.
 If we run in forced compilation mode (<code>-Xcomp</code>), the build
 system will automatically adjust this factor to compensate for less
-performance. Defaults to 1.</p>
+performance. Defaults to 4.</p>
 <h4 id="failure_handler_timeout">FAILURE_HANDLER_TIMEOUT</h4>
 <p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The
 default value is 0. This is only valid if the failure handler is
diff --git a/doc/testing.md b/doc/testing.md
index 324f9645c27..0144610a5bf 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -387,7 +387,7 @@ The `TIMEOUT_FACTOR` is forwarded to JTReg framework itself
 (`-timeoutFactor`). Also, some test cases that programmatically wait a
 certain amount of time will apply this factor. If we run in forced
 compilation mode (`-Xcomp`), the build system will automatically
-adjust this factor to compensate for less performance. Defaults to 1.
+adjust this factor to compensate for less performance. Defaults to 4.
 
 #### FAILURE_HANDLER_TIMEOUT
 
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 7b05a0ba12f..947389f64f9 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -946,8 +946,8 @@ define SetupRunJtregTestBody
   JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
 
   JTREG_AUTO_PROBLEM_LISTS :=
-  # Please reach consensus before changing this. It was not easy changing it to a `1`.
-  JTREG_AUTO_TIMEOUT_FACTOR := 1
+  # Please reach consensus before changing this.
+  JTREG_AUTO_TIMEOUT_FACTOR := 4
 
   ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt