[RFA/doco] (Ada) provide the exception message when hitting an exception catchpoint
Commit Message
> +ERROR: tcl error sourcing /home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp.
> +ERROR: can't read "exception_name(",exception-message="foo\.adb:[0-9]+ explicit raise)": variable isn't array
> + while executing
> +"mi_expect_stop "breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"$exception_name(\",exception-message=\"$exception_message)?" "foo..."
> + (procedure "continue_to_exception" line 17)
> + invoked from within
> +"continue_to_exception \
> + "CONSTRAINT_ERROR" "foo\\.adb:$decimal explicit raise" \
> + "continue until CE caught by all-exceptions catchpoint""
> + (file "/home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp" line 106)
> + invoked from within
> +"source /home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp"
> + ("uplevel" body line 1)
> + invoked from within
> +"uplevel #0 source /home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp"
> + invoked from within
> +"catch "uplevel #0 source $test_file_name""
Grumpf. Sorry about that. I'm not sure why it was working for me
before. I was able to reproduce on a different machine, but noticed
another error in the process. Attached is a tentative patch. It gives
me clean results (15 PASSes). Does it work for you?
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.
Thanks!
Comments
On 11/25/2017 02:05 AM, Joel Brobecker wrote:
>> +ERROR: tcl error sourcing /home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp.
>> +ERROR: can't read "exception_name(",exception-message="foo\.adb:[0-9]+ explicit raise)": variable isn't array
>> + while executing
>> +"mi_expect_stop "breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"$exception_name(\",exception-message=\"$exception_message)?" "foo..."
>> + (procedure "continue_to_exception" line 17)
>> + invoked from within
>> +"continue_to_exception \
>> + "CONSTRAINT_ERROR" "foo\\.adb:$decimal explicit raise" \
>> + "continue until CE caught by all-exceptions catchpoint""
>> + (file "/home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp" line 106)
>> + invoked from within
>> +"source /home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp"
>> + ("uplevel" body line 1)
>> + invoked from within
>> +"uplevel #0 source /home/pedro/gdb/src/gdb/testsuite/gdb.ada/mi_catch_ex.exp"
>> + invoked from within
>> +"catch "uplevel #0 source $test_file_name""
>
> Grumpf. Sorry about that. I'm not sure why it was working for me
> before. I was able to reproduce on a different machine, but noticed
> another error in the process. Attached is a tentative patch. It gives
> me clean results (15 PASSes). Does it work for you?
Yup, works for me.
Thanks,
Pedro Alves
>
> 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.
>
> > Grumpf. Sorry about that. I'm not sure why it was working for me
> > before. I was able to reproduce on a different machine, but noticed
> > another error in the process. Attached is a tentative patch. It gives
> > me clean results (15 PASSes). Does it work for you?
>
> Yup, works for me.
Thanks for confirming, Pedro. Now pushed to master.
> > 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.
> >
From 3649f51b60ae1711a2c449f64a1887326ea066c7 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Fri, 24 Nov 2017 17:48:46 -0800
Subject: [PATCH] fix two issues in gdb.ada/mi_catch_ex.exp (re:
"exception-message")
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
---
gdb/testsuite/gdb.ada/mi_catch_ex.exp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@@ -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
--
2.11.0