aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2019-10-07 13:10:55 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2019-10-07 13:17:49 +0100
commit60ff3cd784ac3a96084af21e4c945fe6925cd1fa (patch)
tree45ac550794e7eee963b49e06610e8d124e554f66 /gdb
parentb2caee6aaa78106d7ae3c46dda3a84a325e43a1d (diff)
downloadgdb-60ff3cd784ac3a96084af21e4c945fe6925cd1fa.zip
gdb-60ff3cd784ac3a96084af21e4c945fe6925cd1fa.tar.gz
gdb-60ff3cd784ac3a96084af21e4c945fe6925cd1fa.tar.bz2
gdb/testsuite/ada: Handle missing debug info case
Update a test script to handle the case where missing Ada debug information means we can't catch exceptions. This was discussed on the list here: https://sourceware.org/ml/gdb-patches/2019-08/msg00607.html And is similar to code that already exists in the test scripts gdb.ada/catch_ex.exp and gdb.ada/mi_catch_ex.exp. gdb/testsuite/ChangeLog: * gdb.ada/catch_ex_std.exp: Handle being unabled to catch Ada exceptions due to missing debug information.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.ada/catch_ex_std.exp25
2 files changed, 23 insertions, 7 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c3fc339..4adf16a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-07 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * gdb.ada/catch_ex_std.exp: Handle being unabled to catch Ada
+ exceptions due to missing debug information.
+
2019-10-07 Tom de Vries <tdevries@suse.de>
* gdb.base/default.exp: Expect _gdb_major/_gdb_minor to be 9.1.
diff --git a/gdb/testsuite/gdb.ada/catch_ex_std.exp b/gdb/testsuite/gdb.ada/catch_ex_std.exp
index 839d0bb..f3a4e59 100644
--- a/gdb/testsuite/gdb.ada/catch_ex_std.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex_std.exp
@@ -95,12 +95,23 @@ if {![runto_main]} then {
return 0
}
-gdb_test "catch exception some_kind_of_error" \
- "Catchpoint \[0-9\]+: `some_kind_of_error' Ada exception"
+set can_catch_exceptions 0
+gdb_test_multiple "catch exception some_kind_of_error" "" {
+ -re "Catchpoint \[0-9\]+: `some_kind_of_error' Ada exception\r\n$gdb_prompt $" {
+ pass $gdb_test_name
+ set can_catch_exceptions 1
+ }
-gdb_test "cont" \
- "Catchpoint \[0-9\]+, .* at .*foo\.adb:\[0-9\]+.*" \
- "caught the exception"
+ -re "Your Ada runtime appears to be missing some debugging information.\r\nCannot insert Ada exception catchpoint in this configuration.\r\n$gdb_prompt $" {
+ unsupported $gdb_test_name
+ }
+}
-gdb_test "print \$_ada_exception = some_package.some_kind_of_error'Address" \
- " = true"
+if { $can_catch_exceptions } {
+ gdb_test "cont" \
+ "Catchpoint \[0-9\]+, .* at .*foo\.adb:\[0-9\]+.*" \
+ "caught the exception"
+
+ gdb_test "print \$_ada_exception = some_package.some_kind_of_error'Address" \
+ " = true"
+}