[PUSHED] gdb/testsuite: Regenerate the testglue if it is not in
Commit Message
From: Shahab Vahedi <shahab@synopsys.com>
For running the DejaGnu tests, some esoteric configurations
may require a testglue. This, for instance, is true about
testing ARC targets which uses its own DejaGnu board and
a simulator which does not support returning the program's exit
code. Therefore, for those tests that use "gdb_compile", a
"gdb_tg.o" file is compiled and linked into the final
executable.
There are tests that invoke "gdb_compile" from different
directories. Let's take a look at an example test:
gdb.base/fullname.exp. The purpose of this test is to build
the executable from different directories (absolute vs. relative
vs. other) and then check if gdb can handle setting breakpoints
accordingly.
When "gdb_compile" generates the "gdb_tg.o", it does not
do it again for the same test. Although this might seem
efficient, it can lead to problems when changing directories
before the next compile:
gdb compile failed, arc-elf32-gcc: error: gdb_tg.o:
No such file or directory
This patch checks if the wrapper file ("gdb_tg.o") is still in
reach and if it is not, it will stimulate the regeneration of
the wrapper.
It is worth mentioning that GCC's DejaGnu tests handle these
scenarios as well and they seem to be more efficient in doing so
by saving the library paths and manipulating them if necessary
[1]. However, for GDB tests, that require less compilations,
I think the proposed solution should be fine compared to a more
full fledged solution from GCC. The glue file in our case is
only 2 KiB.
Last but not least, I ran the x86_64 tests on an x86_64 host and
found no regression.
[1]
Avid coders may look for "set_ld_library_path_env_vars" in
gcc/testsuite/lib/target-libpath.exp.
gdb/testsuite/ChangeLog:
* lib/gdb.exp (gdb_wrapper_init): Reset
"gdb_wrapper_initialized" to 0 if "wrapper_file" does
not exist.
---
gdb/testsuite/ChangeLog | 6 ++++++
gdb/testsuite/lib/gdb.exp | 13 +++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
@@ -1,3 +1,9 @@
+2020-02-06 Shahab Vahedi <shahab@synopsys.com>
+
+ * lib/gdb.exp (gdb_wrapper_init): Reset
+ "gdb_wrapper_initialized" to 0 if "wrapper_file" does
+ not exist.
+
2020-02-20 Tom de Vries <tdevries@suse.de>
PR go/17018
@@ -3577,11 +3577,20 @@ proc gdb_wrapper_init { args } {
global gdb_wrapper_flags
global gdb_wrapper_target
+ # If the wrapper is initialized but the wrapper file cannot be
+ # found anymore, the wrapper file must be built again.
+ if { $gdb_wrapper_initialized == 1 && \
+ [info exists gdb_wrapper_file] && \
+ ![file exists $gdb_wrapper_file] } {
+ verbose "reinitializing the wrapper"
+ set gdb_wrapper_initialized 0
+ }
+
if { $gdb_wrapper_initialized == 1 } { return; }
if {[target_info exists needs_status_wrapper] && \
[target_info needs_status_wrapper] != "0"} {
- set result [build_wrapper "testglue.o"]
+ set result [build_wrapper [standard_output_file "testglue.o"]]
if { $result != "" } {
set gdb_wrapper_file [lindex $result 0]
set gdb_wrapper_flags [lindex $result 1]
@@ -3831,7 +3840,7 @@ proc gdb_compile {source dest type options} {
verbose "options are $options"
verbose "source is $source $dest $type $options"
- if { $gdb_wrapper_initialized == 0 } { gdb_wrapper_init }
+ gdb_wrapper_init
if {[target_info exists needs_status_wrapper] && \
[target_info needs_status_wrapper] != "0" && \