27ab902d16
- Master backport: * gdb-fix-breakpoints-on-file-reloads-for-pie-binaries.patch - Master backports testsuite: * gdb-testsuite-i386-pkru-exp.patch * gdb-testsuite-read1-fixes.patch * gdb-testsuite-pie-no-pie.patch * gdb-testsuite-add-missing-initial-prompt-read-in-multidictionary.exp.patch - Work around bsc#1115034: * gdb-testsuite-ada-pie.patch - Fixes for fedora patches: * gdb-testsuite-fix-perror-in-gdb.opt-fortran-string.exp.patch * gdb-testsuite-avoid-pagination-in-attach-32.exp.patch OBS-URL: https://build.opensuse.org/request/show/721544 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=219
126 lines
3.9 KiB
Diff
126 lines
3.9 KiB
Diff
[gdb/testsuite] Compile ada hello world for skip_ada_tests
|
|
|
|
For openSUSE Leap 15.0 with gcc-PIE installed (which makes gcc create PIE
|
|
executables by default) we get:
|
|
...
|
|
FAIL: gdb.ada/O2_float_param.exp: compilation foo.adb
|
|
...
|
|
|
|
The problem is that while gcc-PIE affects gcc, it does not affect gnatlink,
|
|
so it links in the libgnat.a, rather than libgnat_pic.a. [ This is
|
|
bsc#1115034. ]
|
|
|
|
[ Without gcc-PIE, we have a related problem: if we run ada tests with
|
|
--target_board=unix/-fPIE/-pie, which makes sure PIE executables are generated
|
|
for c/c++ test-cases, still we get non-PIE ada executables, because gnatmake
|
|
does not pass -pie to gnatlink. And if gnatmake would pass -pie to gnatlink,
|
|
we'd run into the same FAIL as above because gnatlink does not use use
|
|
libgnat_pic.a when -pie is specified (this is PR gcc/87936). So, in order to
|
|
have ada tests generate PIE executables, we need
|
|
--target_board=unix/-fPIE/-largs/-pie/-lgnat_pic/-margs, which will not work
|
|
with c/c++ test-cases. ]
|
|
|
|
For now, we check whether we can compile an ada hello world, and if not,
|
|
generate an UNSUPPORTED in either skip_ada_tests or gdb_compile_ada, to
|
|
not have this problem result in ~200 FAILs.
|
|
|
|
gdb/testsuite/ChangeLog:
|
|
|
|
2019-08-06 Tom de Vries <tdevries@suse.de>
|
|
|
|
* lib/ada.exp (gdb_compile_ada_bare): Factor out of ...
|
|
(gdb_compile_ada): ... here.
|
|
(gdb_can_compile_ada): New gdb_caching_proc.
|
|
* lib/gdb.exp: Add load_lib ada.exp.
|
|
(skip_ada_tests): Return 1 if !gdb_can_compile_ada.
|
|
|
|
---
|
|
gdb/testsuite/lib/ada.exp | 38 +++++++++++++++++++++++++++++++++++++-
|
|
gdb/testsuite/lib/gdb.exp | 6 ++++++
|
|
2 files changed, 43 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
|
|
index 1345c747c5..e3a600327e 100644
|
|
--- a/gdb/testsuite/lib/ada.exp
|
|
+++ b/gdb/testsuite/lib/ada.exp
|
|
@@ -29,7 +29,7 @@ proc target_compile_ada_from_dir {builddir source dest type options} {
|
|
|
|
# Compile some Ada code.
|
|
|
|
-proc gdb_compile_ada {source dest type options} {
|
|
+proc gdb_compile_ada_bare {source dest type options} {
|
|
|
|
set srcdir [file dirname $source]
|
|
set gprdir [file dirname $srcdir]
|
|
@@ -53,10 +53,46 @@ proc gdb_compile_ada {source dest type options} {
|
|
# We therefore simply check whether the dest file has been created
|
|
# or not. Unless not present, the build has succeeded.
|
|
if [file exists $dest] { set result "" }
|
|
+ return $result
|
|
+}
|
|
+
|
|
+proc gdb_compile_ada {source dest type options} {
|
|
+ if { [gdb_can_compile_ada] == 0 } {
|
|
+ global gdb_test_file_name
|
|
+ unsupported "$gdb_test_file_name"
|
|
+ return "Cannot compile ada"
|
|
+ }
|
|
+ set result [gdb_compile_ada_bare $source $dest $type $options]
|
|
gdb_compile_test $source $result
|
|
return $result
|
|
}
|
|
|
|
+gdb_caching_proc gdb_can_compile_ada {
|
|
+ set name "hello"
|
|
+ set dir "[pwd]/tmp-ada-hello-[pid]"
|
|
+ set src "$dir/$name.adb"
|
|
+ set dest "$dir/$name"
|
|
+
|
|
+ set code {
|
|
+ with Ada.Text_IO;
|
|
+
|
|
+ procedure Hello is
|
|
+ begin
|
|
+ Ada.Text_IO.Put_Line("Hello, world!");
|
|
+ end Hello;
|
|
+ }
|
|
+
|
|
+ file mkdir $dir
|
|
+ gdb_produce_source $src $code
|
|
+ set res [gdb_compile_ada_bare $src $dest executable {debug}]
|
|
+ file delete -force $dir
|
|
+
|
|
+ if { $res != "" } {
|
|
+ return 0
|
|
+ }
|
|
+ return 1
|
|
+}
|
|
+
|
|
# Like standard_testfile, but for Ada. Historically the Ada tests
|
|
# used a different naming convention from many of the other gdb tests,
|
|
# and this difference was preserved during the conversion to
|
|
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
|
|
index edc8dfcdfd..8585320bd2 100644
|
|
--- a/gdb/testsuite/lib/gdb.exp
|
|
+++ b/gdb/testsuite/lib/gdb.exp
|
|
@@ -29,6 +29,7 @@ load_lib libgloss.exp
|
|
load_lib cache.exp
|
|
load_lib gdb-utils.exp
|
|
load_lib memory.exp
|
|
+load_lib ada.exp
|
|
|
|
global GDB
|
|
|
|
@@ -1881,6 +1882,11 @@ proc skip_fortran_tests {} {
|
|
# Return a 1 if I don't even want to try to test ada.
|
|
|
|
proc skip_ada_tests {} {
|
|
+ if { [gdb_can_compile_ada] == 0 } {
|
|
+ global gdb_test_file_name
|
|
+ unsupported "$gdb_test_file_name"
|
|
+ return 1
|
|
+ }
|
|
return 0
|
|
}
|
|
|