--- a/test/jdk/com/sun/jdi/lib/jdb/Jdb.java Fri Sep 21 15:11:09 2018 +0200
+++ b/test/jdk/com/sun/jdi/lib/jdb/Jdb.java Fri Sep 21 10:18:12 2018 -0700
@@ -73,9 +73,9 @@
private static final String lineSeparator = System.getProperty("line.separator");
// wait time before check jdb output (in ms)
- private static long sleepTime = 1000;
+ private static final long sleepTime = 1000;
// max time to wait for jdb output (in ms)
- private static long timeout = 60000;
+ private static final long timeout = Utils.adjustTimeout(60000);
// pattern for message of a breakpoint hit
public static final String BREAKPOINT_HIT = "Breakpoint hit:";
@@ -215,7 +215,7 @@
throw new RuntimeException("Attempt to send command '" + cmd.cmd + "' to terminated jdb");
}
- System.out.println("> " + cmd.cmd);
+ log("> " + cmd.cmd);
inputWriter.println(cmd.cmd);
@@ -251,13 +251,13 @@
command(JdbCommand.quit());
}
- private void log(String s) {
+ void log(String s) {
System.out.println(s);
}
private void logJdb(List<String> reply) {
jdbOutput.addAll(reply);
- reply.forEach(s -> System.out.println("[jdb] " + s));
+ reply.forEach(s -> log("[jdb] " + s));
}
// returns the whole jdb output as a string