test/jdk/com/sun/jdi/lib/jdb/Jdb.java

@@ -205,10 +205,14 @@
         throw new RuntimeException("waitForPrompt timed out after " + (timeout/1000)
                 + " seconds, looking for '" + promptPattern + "', in " + lines + " lines");
     }
 
     public List<String> command(JdbCommand cmd) {
+        return command(cmd, false);
+    }
+
+    public List<String> command(JdbCommand cmd, boolean waitForSimplePrompt) {
         if (!jdb.isAlive()) {
             if (cmd.allowExit) {
                 // return remaining output
                 return outputHandler.reset();
             }

@@ -221,11 +225,11 @@
 
         if (inputWriter.checkError()) {
             throw new RuntimeException("Unexpected IO error while writing command '" + cmd.cmd + "' to jdb stdin stream");
         }
 
-        return waitForPrompt(1, cmd.allowExit);
+        return waitForSimplePrompt ? waitForSimplePrompt(1, cmd.allowExit) : waitForPrompt(1, cmd.allowExit);
     }
 
     public List<String> command(String cmd) {
         return command(new JdbCommand(cmd));
     }