From 7853b2a5d92899c13aba3f968bf0cd18ac62d60f Mon Sep 17 00:00:00 2001 From: David Linus Briemann Date: Wed, 16 Jul 2025 15:53:31 +0200 Subject: [PATCH 1/3] 8362602: Add test.timeout.factor to CompileFactory to avoid test timeouts --- .../hotspot/jtreg/compiler/lib/compile_framework/Compile.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java index 7fde22cd20723..1fb2cfe35bfdc 100644 --- a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java +++ b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java @@ -40,6 +40,7 @@ */ class Compile { private static final int COMPILE_TIMEOUT = 60; + private static final float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); private static final String JAVA_PATH = JDKToolFinder.getJDKTool("java"); private static final String JAVAC_PATH = JDKToolFinder.getJDKTool("javac"); @@ -182,7 +183,8 @@ private static void executeCompileCommand(List command) { int exitCode; try { Process process = builder.start(); - boolean exited = process.waitFor(COMPILE_TIMEOUT, TimeUnit.SECONDS); + long timeout = COMPILE_TIMEOUT * (long)Math.pow(2, timeoutFactor-1); + boolean exited = process.waitFor(timeout, TimeUnit.SECONDS); if (!exited) { process.destroyForcibly(); System.out.println("Timeout: compile command: " + String.join(" ", command)); From 87fdf248dce20ef7143c157a453374a60cdfbacf Mon Sep 17 00:00:00 2001 From: David Linus Briemann Date: Mon, 21 Jul 2025 09:54:53 +0200 Subject: [PATCH 2/3] update copyright header --- test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java index 1fb2cfe35bfdc..2d05bc998fc21 100644 --- a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java +++ b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it From 074bbca3256e00230ed2829e909d8dffc3076f50 Mon Sep 17 00:00:00 2001 From: David Linus Briemann Date: Mon, 21 Jul 2025 11:00:51 +0200 Subject: [PATCH 3/3] make timeout factor scale linearly --- test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java index 2d05bc998fc21..e7f9b949a6d19 100644 --- a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java +++ b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java @@ -183,7 +183,7 @@ private static void executeCompileCommand(List command) { int exitCode; try { Process process = builder.start(); - long timeout = COMPILE_TIMEOUT * (long)Math.pow(2, timeoutFactor-1); + long timeout = COMPILE_TIMEOUT * (long)timeoutFactor; boolean exited = process.waitFor(timeout, TimeUnit.SECONDS); if (!exited) { process.destroyForcibly();