stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8310143: RandomCommandsTest fails due to unexpected VM exit code after JDK-8282797

Browse Source 
Reviewed-by: rcastanedalo, chagedorn
This commit is contained in:
Tobias Hartmann 2023-06-21 07:05:41 +00:00
parent 9eed049098
commit 67fbd87378
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/compiler/compilercontrol/jcmd/StressAddJcmdBase.java
View File

@ -116,7 +116,7 @@ public abstract class StressAddJcmdBase {
private class TimeLimitedExecutor extends Executor {
public TimeLimitedExecutor() {
/* There are no need to check the state */
super(true, VM_OPTIONS, null, null);
super(VM_OPTIONS, null, null);
}
@Override

7
test/hotspot/jtreg/compiler/compilercontrol/share/MultiCommand.java
View File

@ -56,6 +56,7 @@ public class MultiCommand extends AbstractTestBase {
List<CompileCommand> testCases = new ArrayList<>();
for (Command cmd : commands) {
boolean isValid = true;
String argument = null;
if (validOnly && cmd == Command.NONEXISTENT) {
@ -67,6 +68,7 @@ public class MultiCommand extends AbstractTestBase {
argument = Utils.getRandomElement(VALID_INTRINSIC_SAMPLES);
} else {
argument = Utils.getRandomElement(INVALID_INTRINSIC_SAMPLES);
isValid = false;
}
}
@ -78,12 +80,13 @@ public class MultiCommand extends AbstractTestBase {
md = AbstractTestBase.getValidMethodDescriptor(exec);
} else {
md = AbstractTestBase.METHOD_GEN.generateRandomDescriptor(exec);
isValid &= md.isValid();
}
CompileCommand cc;
if (cmd == Command.INTRINSIC) {
cc = cmdGen.generateCompileCommand(cmd, true, md, null, argument);
cc = cmdGen.generateCompileCommand(cmd, isValid, md, null, argument);
} else {
cc = cmdGen.generateCompileCommand(cmd, true, md, null);
cc = cmdGen.generateCompileCommand(cmd, isValid, md, null);
}
testCases.add(cc);
}

12
test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, 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
@ -45,7 +45,6 @@ import java.util.List;
import java.util.Map;
public class Executor {
private final boolean isValid;
private final List<String> vmOptions;
private final Map<Executable, State> states;
private final List<String> jcmdCommands;
@ -57,16 +56,13 @@ public class Executor {
/**
* Constructor
*
* @param isValid shows that the input given to the VM is valid and
* VM shouldn't fail
* @param vmOptions a list of VM input options
* @param states a state map, or null for the non-checking execution
* @param jcmdCommands a list of diagnostic commands to be preformed
* on test VM
*/
public Executor(boolean isValid, List<String> vmOptions,
Map<Executable, State> states, List<String> jcmdCommands) {
this.isValid = isValid;
public Executor(List<String> vmOptions, Map<Executable, State> states,
List<String> jcmdCommands) {
if (vmOptions == null) {
this.vmOptions = new ArrayList<>();
} else {
@ -77,7 +73,7 @@ public class Executor {
}
/**
* Executes separate VM a gets an OutputAnalyzer instance with the results
* Executes separate VM and gets an OutputAnalyzer instance with the results
* of execution
*/
public List<OutputAnalyzer> execute() {

2
test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Scenario.java
View File

@ -104,7 +104,7 @@ public final class Scenario {
jcmdExecCommands.add(JcmdType.PRINT.command);
}
jcmdProcessor = new PrintDirectivesProcessor(directives);
executor = new Executor(isValid, vmopts, states, jcmdExecCommands);
executor = new Executor(vmopts, states, jcmdExecCommands);
}
/**