Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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 @@ -47,7 +47,7 @@ public void badOptionListenTest() {
// turn on logging of launch failures
Logger.getLogger("jdk.jshell.execution").setLevel(Level.ALL);
JShell.builder()
.executionEngine("jdi")
.executionEngine(Presets.TEST_JDI_EXECUTION)
.remoteVMOptions("-BadBadOption")
.build();
} catch (IllegalStateException ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ public class JdiListeningExecutionControlTest extends ExecutionControlTestBase {
@BeforeEach
@Override
public void setUp() {
setUp(builder -> builder.executionEngine("jdi"));
setUp(builder -> builder.executionEngine(Presets.TEST_JDI_EXECUTION));
}
}
11 changes: 9 additions & 2 deletions test/langtools/jdk/jshell/Presets.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,23 @@
import java.util.*;

public class Presets {
private static final int TEST_TIMEOUT = 20_000;

public static final String TEST_DEFAULT_EXECUTION;
public static final String TEST_STANDARD_EXECUTION;
public static final String TEST_JDI_EXECUTION;

static {
String loopback = InetAddress.getLoopbackAddress().getHostAddress();

TEST_DEFAULT_EXECUTION = "failover:0(jdi:hostname(" + loopback + "))," +
"1(jdi:launch(true)), 2(jdi), 3(local)";
"1(jdi:launch(true))," +
"2(jdi:timeout(" + TEST_TIMEOUT + "))," +
"3(local)";
TEST_STANDARD_EXECUTION = "failover:0(jdi:hostname(" + loopback + "))," +
"1(jdi:launch(true)), 2(jdi)";
"1(jdi:launch(true))," +
"2(jdi:timeout(" + TEST_TIMEOUT + "))";
TEST_JDI_EXECUTION = "jdi:timeout(" + TEST_TIMEOUT + ")";
}

public static String[] addExecutionIfMissing(String[] args) {
Expand Down