OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix two issues in gdb.ada/mi_catch_ex.exp (re: "exception-message")

Browse Source 
The following patch introduced a new feature related to Ada exception
catchpoints:

    commit e547c119d043f2ecffb70452020ab9150d083a91
    Author: Joel Brobecker <brobecker@adacore.com>
    Date:   Fri Nov 24 17:09:42 2017 -0500
    Subject: (Ada) provide the exception message when hitting an exception catchpoint

Unfortunately, the patch left 2 errors in gdb.ada/mi_catch_ex.exp,
both inside the "continue_to_exception" function:

  1. The exception message on the console can include the exception
     message, and thus this patch adjust the expected output in
     the corresponding gdb_expect call to allow it;
     to allow it.

  2. There was a TCL syntax confusion in "$exception_name(..."
     that caused TCL to evaluate "exception_name as an array,
     rather than as a variable. This patch fixes this by escaping
     the '(' (and the corresponding closing parenthesis, for
     consistency).

gdb/testsuite/ChangeLog:

        * gdb.ada/mi_catch_ex.exp (continue_to_exception): Adjust
        expected output in gdb_expect call to allow the exception
        message to be present as well.  Fix syntax confusion to avoid
        TCL thinking that exception_name is an array.

Tested on x86_64-linux, with:

    DejaGnu version  1.6
    Expect version   5.45
    Tcl version      8.6
This commit is contained in:
Joel Brobecker 2017-11-27 11:38:54 -08:00
parent 6dda7875a8
commit 10329bb27f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2017-11-27 Joel Brobecker <brobecker@adacore.com>
* gdb.ada/mi_catch_ex.exp (continue_to_exception): Adjust
expected output in gdb_expect call to allow the exception
message to be present as well. Fix syntax confusion to avoid
TCL thinking that exception_name is an array.
2017-11-26 Ulrich Weigand <uweigand@de.ibm.com>
* gdb.arch/spu-info.c: Include <unistd.h>.

4
gdb/testsuite/gdb.ada/mi_catch_ex.exp
View File

@ -87,7 +87,7 @@ proc continue_to_exception { exception_name exception_message test } {
# Match console stream output.
gdb_expect {
-re " $exception_name at $hex in foo " {
-re " $exception_name\( \\($exception_message\\)\)? at $hex in foo " {
}
timeout {
fail "$test (timeout)"
@ -97,7 +97,7 @@ proc continue_to_exception { exception_name exception_message test } {
# Now MI stream output.
mi_expect_stop \
"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"$exception_name(\",exception-message=\"$exception_message)?" \
"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"$exception_name\(\",exception-message=\"$exception_message\)?" \
"foo" "" ".*" ".*" \
".*" \
$test