From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 8EA73385842A; Tue, 14 Mar 2023 13:11:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8EA73385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678799463; bh=1OncN8YOT6FWqQiUJ3A20SAwPfFjp2dGaeXf36K239I=; h=From:To:Subject:Date:From; b=wwezqQIPUMVbbymtVb4oIlcOwKfNQBRvaoSwcQmnWZ/dG76UYMTOWt9Q2Qpc4/hmo 8gvO8ihYVwGESxv5gW/0gTFBn4aXWCEnmD0s3KZ7rw1ZzWEnuw4a4iqZUbgJdZ3oOM EgI0/rig38g8zFcBy+Fb60LF+E7redw2iqRP8+Hw= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Add gdb.testsuite/board-sanity.exp X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 7506fc9bf1fef7904a213c89a2df915e652ed3b9 X-Git-Newrev: ff581559f9d6586d1d05c5a25d777c78edab3517 Message-Id: <20230314131103.8EA73385842A@sourceware.org> Date: Tue, 14 Mar 2023 13:11:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dff581559f9d6= 586d1d05c5a25d777c78edab3517 commit ff581559f9d6586d1d05c5a25d777c78edab3517 Author: Tom de Vries Date: Tue Mar 14 14:11:01 2023 +0100 [gdb/testsuite] Add gdb.testsuite/board-sanity.exp =20 Add a test-case that tests the sanity of target/host boards. =20 It contains a number of tests related to remote file manipulation, exer= cising: - remote_upload - remote_download - remote_file exists - remote_file delete which check that these work together as expected. =20 Tested on x86_64-linux, with all relevant gdb/testsuite/boards/*.exp bo= ards. =20 For target board remote-stdio-gdbserver.exp, this revealed a trivial pr= oblem with the return value of proc ${board}_file for delete, so fix this. =20 The test-case shows that the proc ${board}_download in local-remote-host-native.exp is broken, so remove it. =20 Likewise for board local-remote-host.exp, so remove proc ${board}_downl= oad and associated ${board}_file. =20 Tested on x86_64-linux. Diff: --- gdb/testsuite/boards/local-remote-host-native.exp | 22 ---- gdb/testsuite/boards/local-remote-host.exp | 19 ---- gdb/testsuite/boards/remote-stdio-gdbserver.exp | 3 +- gdb/testsuite/gdb.testsuite/board-sanity.exp | 122 ++++++++++++++++++= ++++ 4 files changed, 124 insertions(+), 42 deletions(-) diff --git a/gdb/testsuite/boards/local-remote-host-native.exp b/gdb/testsu= ite/boards/local-remote-host-native.exp index 6409ac4e536..911310b3072 100644 --- a/gdb/testsuite/boards/local-remote-host-native.exp +++ b/gdb/testsuite/boards/local-remote-host-native.exp @@ -50,14 +50,6 @@ set_board_info rsh_prog /usr/bin/ssh set_board_info rcp_prog /usr/bin/scp set_board_info file_transfer "rsh" =20 -if { ![info exists HOST_DIR] } { - set HOST_DIR [file join [pwd] "remote-host"] -} - -if { $board_type =3D=3D "host" } { - set_board_info gdb_opts "-d \"${HOST_DIR}\"" -} - proc ${board}_spawn { board cmd } { global board_info =20 @@ -70,20 +62,6 @@ proc ${board}_spawn { board cmd } { return $spawn_id } =20 -proc ${board}_download { board src dest } { - global HOST_DIR - - if { ![file exists $HOST_DIR] } { - file mkdir $HOST_DIR - } - - set destfile [file join $HOST_DIR $dest] - verbose -log "${board}_download: file copy -force $src $destfile" - file copy -force $src $destfile - - return $destfile -} - if { $board_type =3D=3D "host" } { set GDBFLAGS "${GDBFLAGS} -iex \"set style enabled off\"" } diff --git a/gdb/testsuite/boards/local-remote-host.exp b/gdb/testsuite/boa= rds/local-remote-host.exp index ff741831cad..e2085047882 100644 --- a/gdb/testsuite/boards/local-remote-host.exp +++ b/gdb/testsuite/boards/local-remote-host.exp @@ -35,25 +35,6 @@ set_board_info rsh_prog /usr/bin/ssh set_board_info rcp_prog /usr/bin/scp set_board_info file_transfer "rsh" =20 -proc ${board}_file { dest op args } { - if { $op =3D=3D "delete" } { - return 0 - } - return [eval [list standard_file $dest $op] $args] -} - -proc ${board}_download { board src dest } { - - # If file name is a relative, convert it to absolute, otherwise file c= an't - # be found on host, because the current directory usually is /home/$US= ER. - # This also bypasses the real download to the host. - if { [file pathtype $src] =3D=3D "relative" } { - return [file join [pwd] $src] - } else { - return $src - } -} - # Like standard_spawn, but force pseudo-tty allocation, with 'ssh -t'. =20 proc ${board}_spawn { board cmd } { diff --git a/gdb/testsuite/boards/remote-stdio-gdbserver.exp b/gdb/testsuit= e/boards/remote-stdio-gdbserver.exp index 479dfb066a4..53e40d86477 100644 --- a/gdb/testsuite/boards/remote-stdio-gdbserver.exp +++ b/gdb/testsuite/boards/remote-stdio-gdbserver.exp @@ -72,7 +72,8 @@ proc get_target_remote_pipe_cmd { } { =20 proc ${board}_file { dest op args } { if { $op =3D=3D "delete" } { - return [remote_exec target "rm -f $args"] + set res [remote_exec target "rm -f $args"] + return [lindex $res 0] } return [eval [list standard_file $dest $op] $args] } diff --git a/gdb/testsuite/gdb.testsuite/board-sanity.exp b/gdb/testsuite/g= db.testsuite/board-sanity.exp new file mode 100644 index 00000000000..b2b3690d1b5 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/board-sanity.exp @@ -0,0 +1,122 @@ +# Copyright 2023 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# The purpose of this test-case is to test the sanity of the used host/tar= get +# board files. + +proc test_remote { remote host_is_target } { + global srcdir subdir + + set file board-sanity.exp + + set shell_ok 0 + set delete_ok 0 + set exists_ok 1 + + if { $host_is_target } { + if { $remote =3D=3D "host" } { + set other_remote "target" + } else { + set other_remote "host" + } + } + + with_test_prefix cleanup-remote { + set res [remote_file $remote delete $file] + gdb_assert { [lindex $res 0] =3D=3D $delete_ok } \ + "remove $remote copy " + + set res [remote_file $remote exists $file] + gdb_assert { $res !=3D $exists_ok } \ + "$remote copy does not exist" + + if { $host_is_target } { + set res [remote_file $other_remote exists $file] + gdb_assert { $res !=3D $exists_ok } \ + "$other_remote copy does not exist"=09 + } + } + + with_test_prefix copy-to-remote { + set remote_file [remote_download $remote $srcdir/$subdir/$file] + gdb_assert { [string equal [file tail $remote_file] $file] =3D=3D 1} \ + "remote_download returns valid value" + + set res [remote_file $remote exists $file] + gdb_assert { $res =3D=3D $exists_ok } \ + "$remote copy exists" + + if { $host_is_target } { + set res [remote_file $other_remote exists $file] + gdb_assert { $res =3D=3D $exists_ok } \ + "$other_remote copy exists" + } + } + + with_test_prefix cleanup-build { + # Note: we're not comparing with delete_ok, return value seems to be + # different for build. + set res [remote_file build delete $file] + gdb_assert { [string equal $res ""] } \ + "remove build copy" + + set res [remote_file build exists $file] + gdb_assert { $res !=3D $exists_ok } \ + "build copy does not exist" + } + + with_test_prefix copy-from-remote { + # Note: we're using $remote_file here instead of $file, otherwise + # this breaks with board_info remotedir. + set build_file [remote_upload $remote $remote_file] + gdb_assert { [string equal [file tail $build_file] $file] =3D=3D 1 } \ + "remote_upload returns valid value" +=09 + set res [remote_file $remote delete $file] + gdb_assert { [string equal $res $delete_ok] =3D=3D 1 } \ + "remove $remote copy" + + set res [remote_file $remote exists $file] + gdb_assert { $res !=3D $exists_ok } \ + "$remote copy does not exist" + + if { $host_is_target } { + set res [remote_file $other_remote exists $file] + gdb_assert { $res !=3D $exists_ok } \ + "$other_remote copy does not exist"=09 + } + + set res [remote_file build exists $file] + gdb_assert { $res =3D=3D $exists_ok } \ + "build copy exists" + + set res [remote_file $remote delete $file] + gdb_assert { $res =3D=3D $delete_ok } \ + "remove build copy" + } +} + +# Host_is_target =3D=3D 1 for local-remote-host-native.exp, if as intended= specified +# with both --target_board and --host_board. +if { [info exists host_board] } { + set host_is_target [string equal $host_board [target_info name]] +} else { + set host_is_target 0 +} + +foreach_with_prefix remote {host target} { + if { [is_remote $remote] } { + test_remote $remote $host_is_target + } +}