diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 23 |
2 files changed, 22 insertions, 12 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a9f624d..06bafce 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2020-07-22 Sandra Loosemore <sandra@codesourcery.com> + + * lib/gdb.exp (gdb_wrapper_file, gdb_wrapper_flags): + Initialize to empty string at top level. + (gdb_wrapper_init): Revert check for file existence on build. + Build the wrapper in its default place, not a build-specific + location. When host == build, make the pathname absolute. + (gdb_compile): Delete leftover declaration of + gdb_wrapper_initialized. Check gdb_wrapper_file being an empty + string instead of uninitialized. + 2020-07-22 Kevin Buettner <kevinb@redhat.com> * gdb.base/corefile2.exp: New file. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 78dae17..5bdeed7 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3694,6 +3694,8 @@ proc current_target_name { } { set gdb_wrapper_initialized 0 set gdb_wrapper_target "" +set gdb_wrapper_file "" +set gdb_wrapper_flags "" proc gdb_wrapper_init { args } { global gdb_wrapper_initialized @@ -3701,27 +3703,25 @@ 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 [standard_output_file "testglue.o"]] + set result [build_wrapper "testglue.o"] if { $result != "" } { set gdb_wrapper_file [lindex $result 0] + if ![is_remote host] { + set gdb_wrapper_file [file join [pwd] $gdb_wrapper_file] + } set gdb_wrapper_flags [lindex $result 1] } else { warning "Status wrapper failed to build." } + } else { + set gdb_wrapper_file "" + set gdb_wrapper_flags "" } + verbose "set gdb_wrapper_file = $gdb_wrapper_file" set gdb_wrapper_initialized 1 set gdb_wrapper_target [current_target_name] } @@ -3857,7 +3857,6 @@ proc gdb_compile {source dest type options} { global GDB_TESTCASE_OPTIONS global gdb_wrapper_file global gdb_wrapper_flags - global gdb_wrapper_initialized global srcdir global objdir global gdb_saved_set_unbuffered_mode_obj @@ -3994,7 +3993,7 @@ proc gdb_compile {source dest type options} { if {[target_info exists needs_status_wrapper] && \ [target_info needs_status_wrapper] != "0" && \ - [info exists gdb_wrapper_file]} { + $gdb_wrapper_file != "" } { lappend options "libs=${gdb_wrapper_file}" lappend options "ldflags=${gdb_wrapper_flags}" } |