From 391d3400084c6a2d805cd0efd925f29347fa7a18 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 15 Nov 2013 20:34:09 +0400 Subject: [PATCH] gdb.ada/info_exc.exp,mi_exc_info.exp: handle runtimes with full debug info. If the runtime has full debug info, then the non-standard exceptions declared in the GNAT runtime will appear in the list of exceptions printed by GDB ("info exceptions" or "-info-ada-exceptions"). This is valid output, so this patch allows for it. gdb/testsuite/ChangeLog: * gdb.ada/info_exc.exp: Allow other global exceptions to be listed in the output of "info exceptions". * gdb.ada/mi_exc_info.exp: Allow other global exceptions to be listed in the output of "-info-ada-exceptions". --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.ada/info_exc.exp | 4 +++- gdb/testsuite/gdb.ada/mi_exc_info.exp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0031289bf53..5ab2656cd5a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2013-11-15 Joel Brobecker + + * gdb.ada/info_exc.exp: Allow other global exceptions to be + listed in the output of "info exceptions". + * gdb.ada/mi_exc_info.exp: Allow other global exceptions to be + listed in the output of "-info-ada-exceptions". + 2013-11-15 Joel Brobecker * gdb.ada/info_exc.exp: Start inferior before starting diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp index 9637bce3a2e..92100292017 100644 --- a/gdb/testsuite/gdb.ada/info_exc.exp +++ b/gdb/testsuite/gdb.ada/info_exc.exp @@ -45,7 +45,9 @@ gdb_test "info exceptions" \ "program_error: $hex" \ "storage_error: $hex" \ "tasking_error: $hex" \ - "const.aint_global_e: $hex"] + ".*" \ + "const.aint_global_e: $hex" \ + ".*"] gdb_test "info exceptions task" \ [multi_line "All Ada exceptions matching regular expression \"task\":" \ diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp index 8325e9051fc..14a9e4de761 100644 --- a/gdb/testsuite/gdb.ada/mi_exc_info.exp +++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp @@ -39,7 +39,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} mi_gdb_test "-info-ada-exceptions" \ - "\\^done,ada-exceptions={nr_rows=\"5\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},{name=\"const.aint_global_e\",address=\"$hex\"}\\\]}" \ + "\\^done,ada-exceptions={nr_rows=\"$decimal\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},.*{name=\"const.aint_global_e\",address=\"$hex\"}.*\\\]}" \ "-info-ada-exceptions" mi_gdb_test "-info-ada-exceptions task" \ -- 2.30.2