From 05bb5d789088822879bc8d14dc6821fa701d15a3 Mon Sep 17 00:00:00 2001 From: Levente Orban Date: Fri, 17 Mar 2017 01:01:10 +0100 Subject: [PATCH] Improve the debugger python client messages (#1654) JerryScript-DCO-1.0-Signed-off-by: Levente Orban orbanl@inf.u-szeged.hu --- jerry-debugger/jerry-client-ws.py | 7 ++++- tests/debugger/do_backtrace.expected | 35 +++++++++++++++--------- tests/debugger/do_break.expected | 24 ++++++++++------- tests/debugger/do_continue.expected | 2 +- tests/debugger/do_delete_all.expected | 18 ++++++++----- tests/debugger/do_dump.expected | 5 ++-- tests/debugger/do_eval.expected | 38 ++++++++++++++++++--------- tests/debugger/do_src.expected | 26 +++++++++++------- tests/debugger/do_step.expected | 29 +++++++++++++------- 9 files changed, 121 insertions(+), 63 deletions(-) diff --git a/jerry-debugger/jerry-client-ws.py b/jerry-debugger/jerry-client-ws.py index cfb313093..a465f3c7a 100755 --- a/jerry-debugger/jerry-client-ws.py +++ b/jerry-debugger/jerry-client-ws.py @@ -147,10 +147,13 @@ class DebuggerPrompt(Cmd): self.stop = False self.quit = False self.cont = True + self.non_interactive = False def precmd(self, line): self.stop = False self.cont = False + if self.non_interactive: + print("%s" % line) return line def postcmd(self, stop, line): @@ -187,7 +190,8 @@ class DebuggerPrompt(Cmd): self.exec_command(args, JERRY_DEBUGGER_CONTINUE) self.stop = True self.cont = True - print("Press enter to stop JavaScript execution.") + if not self.non_interactive: + print("Press enter to stop JavaScript execution.") do_c = do_continue @@ -706,6 +710,7 @@ def main(): prompt = DebuggerPrompt(debugger) prompt.prompt = "(jerry-debugger) " + prompt.non_interactive = non_interactive while True: if not non_interactive and prompt.cont: diff --git a/tests/debugger/do_backtrace.expected b/tests/debugger/do_backtrace.expected index 4f121a85e..8650c197b 100644 --- a/tests/debugger/do_backtrace.expected +++ b/tests/debugger/do_backtrace.expected @@ -1,20 +1,31 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_backtrace.js:15 -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:28 -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:37 -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:40 -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:32 (in test() at line:30, col:1) -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:33 (in test() at line:30, col:1) -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:23 (in foo() at line:21, col:1) -(jerry-debugger) Frame 0: tests/debugger/do_backtrace.js:23 (in foo() at line:21, col:1) +(jerry-debugger) next +Stopped at tests/debugger/do_backtrace.js:28 +(jerry-debugger) n +Stopped at tests/debugger/do_backtrace.js:37 +(jerry-debugger) next +Stopped at tests/debugger/do_backtrace.js:40 +(jerry-debugger) step +Stopped at tests/debugger/do_backtrace.js:32 (in test() at line:30, col:1) +(jerry-debugger) next +Stopped at tests/debugger/do_backtrace.js:33 (in test() at line:30, col:1) +(jerry-debugger) s +Stopped at tests/debugger/do_backtrace.js:23 (in foo() at line:21, col:1) +(jerry-debugger) bt +Frame 0: tests/debugger/do_backtrace.js:23 (in foo() at line:21, col:1) Frame 1: tests/debugger/do_backtrace.js:33 (in test() at line:30, col:1) Frame 2: tests/debugger/do_backtrace.js:40 -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:24 (in foo() at line:21, col:1) -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:25 (in foo() at line:21, col:1) -(jerry-debugger) Stopped at tests/debugger/do_backtrace.js:18 (in f4() at line:17, col:1) -(jerry-debugger) Frame 0: tests/debugger/do_backtrace.js:18 (in f4() at line:17, col:1) +(jerry-debugger) n +Stopped at tests/debugger/do_backtrace.js:24 (in foo() at line:21, col:1) +(jerry-debugger) n +Stopped at tests/debugger/do_backtrace.js:25 (in foo() at line:21, col:1) +(jerry-debugger) s +Stopped at tests/debugger/do_backtrace.js:18 (in f4() at line:17, col:1) +(jerry-debugger) backtrace +Frame 0: tests/debugger/do_backtrace.js:18 (in f4() at line:17, col:1) Frame 1: tests/debugger/do_backtrace.js:25 (in foo() at line:21, col:1) Frame 2: tests/debugger/do_backtrace.js:33 (in test() at line:30, col:1) Frame 3: tests/debugger/do_backtrace.js:40 -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Connection closed. diff --git a/tests/debugger/do_break.expected b/tests/debugger/do_break.expected index 4ee7d3ecf..140cebd3c 100644 --- a/tests/debugger/do_break.expected +++ b/tests/debugger/do_break.expected @@ -1,21 +1,27 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_break.js:15 -(jerry-debugger) Breakpoint 1 at tests/debugger/do_break.js:51 -(jerry-debugger) Breakpoint 2 at tests/debugger/do_break.js:36 (in test() at line:20, col:1) -(jerry-debugger) Breakpoint 3 at tests/debugger/do_break.js:33 (in f() at line:31, col:3) +(jerry-debugger) break do_break.js:51 +Breakpoint 1 at tests/debugger/do_break.js:51 +(jerry-debugger) b do_break.js:36 +Breakpoint 2 at tests/debugger/do_break.js:36 (in test() at line:20, col:1) +(jerry-debugger) break f +Breakpoint 3 at tests/debugger/do_break.js:33 (in f() at line:31, col:3) Breakpoint 4 at tests/debugger/do_break.js:45 (in f() at line:43, col:1) -(jerry-debugger) 1: tests/debugger/do_break.js:51 +(jerry-debugger) list +1: tests/debugger/do_break.js:51 2: tests/debugger/do_break.js:36 (in test() at line:20, col:1) 3: tests/debugger/do_break.js:33 (in f() at line:31, col:3) 4: tests/debugger/do_break.js:45 (in f() at line:43, col:1) -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Stopped at breakpoint:1 tests/debugger/do_break.js:51 -(jerry-debugger) (jerry-debugger) 2: tests/debugger/do_break.js:36 (in test() at line:20, col:1) +(jerry-debugger) delete 1 +(jerry-debugger) list +2: tests/debugger/do_break.js:36 (in test() at line:20, col:1) 3: tests/debugger/do_break.js:33 (in f() at line:31, col:3) 4: tests/debugger/do_break.js:45 (in f() at line:43, col:1) -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Stopped at breakpoint:2 tests/debugger/do_break.js:36 (in test() at line:20, col:1) -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) continue Stopped at breakpoint:3 tests/debugger/do_break.js:33 (in f() at line:31, col:3) -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Connection closed. diff --git a/tests/debugger/do_continue.expected b/tests/debugger/do_continue.expected index ade3ecbcf..dd2c90995 100644 --- a/tests/debugger/do_continue.expected +++ b/tests/debugger/do_continue.expected @@ -1,3 +1,3 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_continue.js:16 -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) continue diff --git a/tests/debugger/do_delete_all.expected b/tests/debugger/do_delete_all.expected index 4d9a3f2dc..85f595fdb 100644 --- a/tests/debugger/do_delete_all.expected +++ b/tests/debugger/do_delete_all.expected @@ -1,11 +1,17 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_delete_all.js:15 -(jerry-debugger) Breakpoint 1 at tests/debugger/do_delete_all.js:17 -(jerry-debugger) Breakpoint 2 at tests/debugger/do_delete_all.js:18 -(jerry-debugger) Breakpoint 3 at tests/debugger/do_delete_all.js:21 (in delete_test() at line:20, col:1) -(jerry-debugger) 1: tests/debugger/do_delete_all.js:17 +(jerry-debugger) break do_delete_all.js:17 +Breakpoint 1 at tests/debugger/do_delete_all.js:17 +(jerry-debugger) b do_delete_all.js:18 +Breakpoint 2 at tests/debugger/do_delete_all.js:18 +(jerry-debugger) b do_delete_all.js:21 +Breakpoint 3 at tests/debugger/do_delete_all.js:21 (in delete_test() at line:20, col:1) +(jerry-debugger) list +1: tests/debugger/do_delete_all.js:17 2: tests/debugger/do_delete_all.js:18 3: tests/debugger/do_delete_all.js:21 (in delete_test() at line:20, col:1) -(jerry-debugger) (jerry-debugger) Stopped at tests/debugger/do_delete_all.js:16 -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) delete all +(jerry-debugger) next +Stopped at tests/debugger/do_delete_all.js:16 +(jerry-debugger) c Connection closed. diff --git a/tests/debugger/do_dump.expected b/tests/debugger/do_dump.expected index 8c8313af1..e22a8fcd2 100644 --- a/tests/debugger/do_dump.expected +++ b/tests/debugger/do_dump.expected @@ -1,11 +1,12 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_dump.js:15 -(jerry-debugger) {60: Function(byte_code_cp:0x3c, source_name:"tests/debugger/do_dump.js", name:"", line:54, column: 8 { Breakpoint(line:58, offset:12, active_index:-1) }), +(jerry-debugger) dump +{60: Function(byte_code_cp:0x3c, source_name:"tests/debugger/do_dump.js", name:"", line:54, column: 8 { Breakpoint(line:58, offset:12, active_index:-1) }), 64: Function(byte_code_cp:0x40, source_name:"tests/debugger/do_dump.js", name:"func", line:34, column: 1 { Breakpoint(line:36, offset:16, active_index:-1) }), 79: Function(byte_code_cp:0x4f, source_name:"tests/debugger/do_dump.js", name:"f1", line:17, column: 1 { Breakpoint(line:30, offset:23, active_index:-1) }), 100: Function(byte_code_cp:0x64, source_name:"tests/debugger/do_dump.js", name:"g2", line:26, column: 5 { Breakpoint(line:26, offset:12, active_index:-1) }), 102: Function(byte_code_cp:0x66, source_name:"tests/debugger/do_dump.js", name:"f2", line:19, column: 3 { Breakpoint(line:27, offset:26, active_index:-1) }), 109: Function(byte_code_cp:0x6d, source_name:"tests/debugger/do_dump.js", name:"g1", line:21, column: 5 { Breakpoint(line:22, offset:18, active_index:-1),Breakpoint(line:23, offset:23, active_index:-1) }), 128: Function(byte_code_cp:0x80, source_name:"tests/debugger/do_dump.js", name:"", line:1, column: 1 { Breakpoint(line:41, offset:47, active_index:-1),Breakpoint(line:51, offset:57, active_index:-1),Breakpoint(line:49, offset:52, active_index:-1),Breakpoint(line:54, offset:62, active_index:-1),Breakpoint(line:15, offset:42, active_index:-1) })} -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Connection closed. diff --git a/tests/debugger/do_eval.expected b/tests/debugger/do_eval.expected index 0390838e8..ce91e84c7 100644 --- a/tests/debugger/do_eval.expected +++ b/tests/debugger/do_eval.expected @@ -1,16 +1,28 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_eval.js:15 -(jerry-debugger) undefined -(jerry-debugger) Stopped at tests/debugger/do_eval.js:23 -(jerry-debugger) 5 -(jerry-debugger) Breakpoint 1 at tests/debugger/do_eval.js:19 (in f() at line:17, col:1) -(jerry-debugger) Stopped at breakpoint:1 tests/debugger/do_eval.js:19 (in f() at line:17, col:1) -(jerry-debugger) undefined -(jerry-debugger) Stopped at tests/debugger/do_eval.js:20 (in f() at line:17, col:1) -(jerry-debugger) 6 -(jerry-debugger) 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 XXX 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 YYY 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 ZZZ 123 -(jerry-debugger) 8 -(jerry-debugger) Stopped at tests/debugger/do_eval.js:24 -(jerry-debugger) 11.3 -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) e a +undefined +(jerry-debugger) n +Stopped at tests/debugger/do_eval.js:23 +(jerry-debugger) eval a +5 +(jerry-debugger) break f +Breakpoint 1 at tests/debugger/do_eval.js:19 (in f() at line:17, col:1) +(jerry-debugger) n +Stopped at breakpoint:1 tests/debugger/do_eval.js:19 (in f() at line:17, col:1) +(jerry-debugger) e b +undefined +(jerry-debugger) next +Stopped at tests/debugger/do_eval.js:20 (in f() at line:17, col:1) +(jerry-debugger) e b +6 +(jerry-debugger) e "1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 XXX 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 YYY 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 ZZZ " + 123 +1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 XXX 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 YYY 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 ZZZ 123 +(jerry-debugger) e b = 8 +8 +(jerry-debugger) n +Stopped at tests/debugger/do_eval.js:24 +(jerry-debugger) e a +11.3 +(jerry-debugger) c Connection closed. diff --git a/tests/debugger/do_src.expected b/tests/debugger/do_src.expected index d317f9839..8233ca492 100644 --- a/tests/debugger/do_src.expected +++ b/tests/debugger/do_src.expected @@ -1,14 +1,22 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_src.js:19 -(jerry-debugger) Breakpoint 1 at tests/debugger/do_src.js:16 (in f() at line:15, col:1) -(jerry-debugger) Stopped at breakpoint:1 tests/debugger/do_src.js:16 (in f() at line:15, col:1) -(jerry-debugger) Stopped at tests/debugger/do_src.js:20 -(jerry-debugger) Stopped at :1 -(jerry-debugger) f = function f() { +(jerry-debugger) b f +Breakpoint 1 at tests/debugger/do_src.js:16 (in f() at line:15, col:1) +(jerry-debugger) n +Stopped at breakpoint:1 tests/debugger/do_src.js:16 (in f() at line:15, col:1) +(jerry-debugger) next +Stopped at tests/debugger/do_src.js:20 +(jerry-debugger) s +Stopped at :1 +(jerry-debugger) src +f = function f() { print('F2') } -(jerry-debugger) Stopped at tests/debugger/do_src.js:21 -(jerry-debugger) Stopped at :2 (in f() at line:1, col:5) -(jerry-debugger) f = function f() { +(jerry-debugger) n +Stopped at tests/debugger/do_src.js:21 +(jerry-debugger) step +Stopped at :2 (in f() at line:1, col:5) +(jerry-debugger) src +f = function f() { print('F2') } -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Connection closed. diff --git a/tests/debugger/do_step.expected b/tests/debugger/do_step.expected index f389ea4eb..c7acf5759 100644 --- a/tests/debugger/do_step.expected +++ b/tests/debugger/do_step.expected @@ -1,17 +1,26 @@ Connecting to: localhost:5001 Stopped at tests/debugger/do_step.js:32 -(jerry-debugger) Stopped at tests/debugger/do_step.js:22 (in f1() at line:15, col:1) -(jerry-debugger) Stopped at tests/debugger/do_step.js:19 (in g() at line:17, col:3) -(jerry-debugger) Frame 0: tests/debugger/do_step.js:19 (in g() at line:17, col:3) +(jerry-debugger) step +Stopped at tests/debugger/do_step.js:22 (in f1() at line:15, col:1) +(jerry-debugger) step +Stopped at tests/debugger/do_step.js:19 (in g() at line:17, col:3) +(jerry-debugger) backtrace +Frame 0: tests/debugger/do_step.js:19 (in g() at line:17, col:3) Frame 1: tests/debugger/do_step.js:22 (in f1() at line:15, col:1) Frame 2: tests/debugger/do_step.js:32 -(jerry-debugger) Stopped at tests/debugger/do_step.js:23 (in f1() at line:15, col:1) -(jerry-debugger) Frame 0: tests/debugger/do_step.js:23 (in f1() at line:15, col:1) +(jerry-debugger) next +Stopped at tests/debugger/do_step.js:23 (in f1() at line:15, col:1) +(jerry-debugger) bt +Frame 0: tests/debugger/do_step.js:23 (in f1() at line:15, col:1) Frame 1: tests/debugger/do_step.js:32 -(jerry-debugger) Stopped at tests/debugger/do_step.js:33 -(jerry-debugger) Stopped at tests/debugger/do_step.js:28 (in f2() at line:26, col:1) -(jerry-debugger) Stopped at tests/debugger/do_step.js:29 (in f2() at line:26, col:1) -(jerry-debugger) Frame 0: tests/debugger/do_step.js:29 (in f2() at line:26, col:1) +(jerry-debugger) next +Stopped at tests/debugger/do_step.js:33 +(jerry-debugger) s +Stopped at tests/debugger/do_step.js:28 (in f2() at line:26, col:1) +(jerry-debugger) n +Stopped at tests/debugger/do_step.js:29 (in f2() at line:26, col:1) +(jerry-debugger) bt +Frame 0: tests/debugger/do_step.js:29 (in f2() at line:26, col:1) Frame 1: tests/debugger/do_step.js:33 -(jerry-debugger) Press enter to stop JavaScript execution. +(jerry-debugger) c Connection closed.