* [pushed] [gdb/testsuite] Add shared_gnat_runtime_has_debug_info
@ 2023-06-19 9:47 Tom de Vries
0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2023-06-19 9:47 UTC (permalink / raw)
To: gdb-patches
Test-case gdb.ada/catch_ex_std.exp passes for me with package
libada7-debuginfo installed, but after removing it I get:
...
(gdb) catch exception some_kind_of_error^M
Your Ada runtime appears to be missing some debugging information.^M
Cannot insert Ada exception catchpoint in this configuration.^M
(gdb) FAIL: gdb.ada/catch_ex_std.exp: catch exception some_kind_of_error
...
The test-case contains a require gnat_runtime_has_debug_info to deal with
this, but the problem is that this checks the static gnat runtime, while this
test-case uses the shared one.
Fix this by introducing shared_gnat_runtime_has_debug_info, and requiring that
one instead.
Tested on x86_64-linux.
PR testsuite/30094
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30094
---
gdb/testsuite/gdb.ada/catch_ex_std.exp | 2 +-
gdb/testsuite/lib/ada.exp | 27 ++++++++++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/gdb/testsuite/gdb.ada/catch_ex_std.exp b/gdb/testsuite/gdb.ada/catch_ex_std.exp
index 3a2b10a8c13..052d4d7a668 100644
--- a/gdb/testsuite/gdb.ada/catch_ex_std.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex_std.exp
@@ -17,7 +17,7 @@ require allow_shlib_tests
load_lib "ada.exp"
-require allow_ada_tests gnat_runtime_has_debug_info
+require allow_ada_tests shared_gnat_runtime_has_debug_info
standard_ada_testfile foo
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
index b4a93faefa5..d45d75994dd 100644
--- a/gdb/testsuite/lib/ada.exp
+++ b/gdb/testsuite/lib/ada.exp
@@ -171,7 +171,7 @@ proc gnatmake_version_at_least { major } {
# Return 1 if the GNAT runtime appears to have debug info.
-gdb_caching_proc gnat_runtime_has_debug_info {} {
+proc gnat_runtime_has_debug_info_1 { shared } {
if { ![allow_ada_tests] } {
return 0
}
@@ -181,7 +181,18 @@ gdb_caching_proc gnat_runtime_has_debug_info {} {
set src "$srcdir/lib/gnat_debug_info_test.adb"
set dst [standard_output_file "gnat_debug_info_test"]
- if { [gdb_compile_ada_1 $src $dst executable {debug}] != "" } {
+ set opts {}
+ lappend opts debug
+ if { $shared } {
+ # Make sure we link against the shared GNAT run time.
+ set gnatbind_options [list -bargs -shared -margs]
+
+ foreach option $gnatbind_options {
+ lappend opts [concat "additional_flags=" $option]
+ }
+ }
+
+ if { [gdb_compile_ada_1 $src $dst executable $opts] != "" } {
return 0
}
@@ -208,3 +219,15 @@ gdb_caching_proc gnat_runtime_has_debug_info {} {
return $has_debug_info
}
+
+# Return 1 if the static GNAT runtime appears to have debug info.
+
+gdb_caching_proc gnat_runtime_has_debug_info {} {
+ return [gnat_runtime_has_debug_info_1 0]
+}
+
+# Return 1 if the shared GNAT runtime appears to have debug info.
+
+gdb_caching_proc shared_gnat_runtime_has_debug_info {} {
+ return [gnat_runtime_has_debug_info_1 1]
+}
base-commit: ba769bb0e6fdf5b4c55577b068b93adf2f6d1333
--
2.35.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-19 9:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-19 9:47 [pushed] [gdb/testsuite] Add shared_gnat_runtime_has_debug_info Tom de Vries
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).