diff options
author | Tom de Vries <tdevries@suse.de> | 2022-10-07 18:08:00 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2022-10-07 18:08:00 +0200 |
commit | 7808a1f7f68cb38f66cf44bb91faae29b0dbfedd (patch) | |
tree | aae9675360f9ccbb369984a502f596c7417b6865 /gdb | |
parent | 8c7cb01a296c3f91372505b67be76ca41f0665a6 (diff) | |
download | fsf-binutils-gdb-7808a1f7f68cb38f66cf44bb91faae29b0dbfedd.zip fsf-binutils-gdb-7808a1f7f68cb38f66cf44bb91faae29b0dbfedd.tar.gz fsf-binutils-gdb-7808a1f7f68cb38f66cf44bb91faae29b0dbfedd.tar.bz2 |
[gdb/testsuite] Handle host cleanfiles
When running test-case gdb.server/abspath.exp with host board
local-remote-host-notty, I get:
...
$ git sti
...
deleted: gdb/testsuite/gdb.xml/trivial.xml
...
This happens as follows. The test-case calls skip_gdbserver_test, which calls
gdb_skip_xml_test, which does:
...
set xml_file [gdb_remote_download host "${srcdir}/gdb.xml/trivial.xml"]
...
Then proc gdb_remote_download appends $xml_file (which for this particular
host board happens to be ${srcdir}/gdb.xml/trivial.xml) to cleanfiles, which
ends up being handled in gdb_finish by:
...
eval remote_file target delete $cleanfiles
...
The problem is that a host file is deleted using target delete.
Fix this by splitting cleanfiles up in cleanfiles_target and cleanfiles_host.
Tested on x86_64-linux.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 99a6de6..44cc28b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5572,10 +5572,14 @@ proc gdb_remote_download {dest fromfile {tofile {}}} { if {[is_remote $dest]} { # When the DEST is remote, we simply send the file to DEST. - global cleanfiles + global cleanfiles_target cleanfiles_host set destname [remote_download $dest $fromfile $tofile] - lappend cleanfiles $destname + if { $dest == "target" } { + lappend cleanfiles_target $destname + } elseif { $dest == "host" } { + lappend cleanfiles_host $destname + } return $destname } else { @@ -5722,7 +5726,8 @@ proc default_gdb_init { test_file_name } { global gdb_wrapper_initialized global gdb_wrapper_target global gdb_test_file_name - global cleanfiles + global cleanfiles_target + global cleanfiles_host global pf_prefix # Reset the timeout value to the default. This way, any testcase @@ -5838,7 +5843,8 @@ proc default_gdb_init { test_file_name } { global gdb_instances set gdb_instances 0 - set cleanfiles {} + set cleanfiles_target {} + set cleanfiles_host {} set gdb_test_file_name [file rootname [file tail $test_file_name]] @@ -6150,7 +6156,8 @@ proc gdb_init { args } { proc gdb_finish { } { global gdbserver_reconnect_p global gdb_prompt - global cleanfiles + global cleanfiles_target + global cleanfiles_host global known_globals if { [info procs ::gdb_tcl_unknown] != "" } { @@ -6162,9 +6169,13 @@ proc gdb_finish { } { # Exit first, so that the files are no longer in use. gdb_exit - if { [llength $cleanfiles] > 0 } { - eval remote_file target delete $cleanfiles - set cleanfiles {} + if { [llength $cleanfiles_target] > 0 } { + eval remote_file target delete $cleanfiles_target + set cleanfiles_target {} + } + if { [llength $cleanfiles_host] > 0 } { + eval remote_file host delete $cleanfiles_host + set cleanfiles_host {} } # Unblock write access to the banned variables. Dejagnu typically |