diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/python/python.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-framefilter.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/python.exp | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 634d272..a45c2c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com> + * python/python.c (gdbpy_print_stack): Reformat an error message. + +2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com> + * tui/tui-interp.c (tui_command_line_handler): New function. (tui_interp::resume): Register tui_command_line_handler as the input_handler. diff --git a/gdb/python/python.c b/gdb/python/python.c index fd760f6..009c0c4 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1320,7 +1320,7 @@ gdbpy_print_stack (void) PyErr_Clear (); } else - fprintf_filtered (gdb_stderr, "Python Exception %s %s: \n", + fprintf_filtered (gdb_stderr, "Python Exception %s: %s\n", type.get (), msg.get ()); } catch (const gdb_exception &except) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ed496e4..8fb69c0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com> + * gdb.python/py-framefilter.exp: Update expected results. + * gdb.python/python.exp: Update expected results. + +2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com> + * gdb.tui/scroll.exp: Tighten expected results. Remove comment about bug in GDB, update expected results, and add more tests. diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index 3468989..a9c6ca6 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -269,7 +269,7 @@ gdb_test_no_output "enable frame-filter global Error" \ "enable frame-filter global Error" set test "bt 1 with Error filter" gdb_test_multiple "bt 1" $test { - -re "Python Exception .*whoops:.*$gdb_prompt $" { + -re "Python Exception .*: whoops\r\n.*$gdb_prompt $" { pass $test } } diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index 83e83b4..c7d879e 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -463,7 +463,7 @@ gdb_test_multiline "prompt substitution readline error_prompt" \ "end" "" gdb_test_multiple "python gdb.prompt_hook = error_prompt" "set the hook error_prompt" { - -re "Python Exception (exceptions.RuntimeError|<(type 'exceptions.|class ')RuntimeError'>) Python exception called.*$gdb_prompt $" { + -re "Python Exception (exceptions.RuntimeError|<(type 'exceptions.|class ')RuntimeError'>): Python exception called\r\n$gdb_prompt $" { pass $gdb_test_name } } |