From 6de9111c512de99fd8cb3ea89f9890b1d72f6ef0 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 21 Apr 2023 09:12:35 +0200 Subject: [PATCH] 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: 2020-11-06 Tom de Vries * lib/ada.exp (gdb_compile_ada): Call gdb_can_compile_ada. (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 | 31 +++++++++++++++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 8 ++++++++ 2 files changed, 39 insertions(+) diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 4bf1368f29f..7d8fbf01fbd 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -90,12 +90,43 @@ proc gdb_compile_ada_1 {source dest type options} { # compile was successful. 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_1 $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_1 $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 990d0c8a70f..6c1f59ef4a6 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -145,6 +145,7 @@ load_lib cache.exp load_lib gdb-utils.exp load_lib memory.exp load_lib check-test-names.exp +load_lib ada.exp # The path to the GDB binary to test. global GDB @@ -2538,6 +2539,13 @@ proc allow_ada_tests {} { # Currently gdb_ada_compile doesn't support remote host. return 0 } + + if { [gdb_can_compile_ada] == 0 } { + global gdb_test_file_name + unsupported "$gdb_test_file_name" + return 0 + } + return 1 } base-commit: af4a87e2b3c2ac5acae1e6f4405fc59e1218de74 -- 2.35.3