Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update the copyright year.


private static final String JAVA_PATH = JDKToolFinder.getJDKTool("java");
private static final String JAVAC_PATH = JDKToolFinder.getJDKTool("javac");
Expand Down Expand Up @@ -182,7 +183,8 @@ private static void executeCompileCommand(List<String> 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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for scaling the timeout exponentially instead of linearly, as jtreg does it and most users would expect?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that I saw this documented somewhere but I cannot find it anymore and in other places it is used linearly, like you say.

I adapted it.

boolean exited = process.waitFor(timeout, TimeUnit.SECONDS);
if (!exited) {
process.destroyForcibly();
System.out.println("Timeout: compile command: " + String.join(" ", command));
Expand Down