From patchwork Thu Sep 4 13:18:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 2647 Received: (qmail 30995 invoked by alias); 4 Sep 2014 13:22:31 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 30971 invoked by uid 89); 4 Sep 2014 13:22:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Sep 2014 13:22:28 +0000 Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41]) by relay1.mentorg.com with esmtp id 1XPWzZ-0007Mz-JA from Yao_Qi@mentor.com ; Thu, 04 Sep 2014 06:22:25 -0700 Received: from GreenOnly (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.2.247.3; Thu, 4 Sep 2014 06:22:25 -0700 From: Yao Qi To: Doug Evans CC: Subject: Re: [PATCH] Another board file for remote host References: <1409232690-24185-1-git-send-email-yao@codesourcery.com> <87y4u2d9ic.fsf@codesourcery.com> Date: Thu, 4 Sep 2014 21:18:19 +0800 In-Reply-To: (Doug Evans's message of "Tue, 2 Sep 2014 07:53:08 -0700") Message-ID: <87d2bbcyn8.fsf@codesourcery.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes Doug Evans writes: > +global GDB > +set GDB [file join [pwd] "../gdb"] > > Check if GDB has been set first, allow the user to > pass this in from the command line. GDB is always set in lib/gdb.exp and it is loaded earlier than the board file. In lib/gdb.exp: if ![info exists GDB] { if ![is_remote host] { set GDB [findfile $base_dir/../../gdb/gdb "$base_dir/../../gdb/gdb" [transform gdb]] } else { set GDB [transform gdb] } } so we can't do the check here. > +# The directory to copy files to. In default, we choose ./remote-host, to > +# avoiding messing up your HOME. You can choose other directory as > +# you like. > +set host_dir [file join [pwd] "remote-host"] > > How about allowing the user to pass this in from the command line? > By convention such variables are then uppercase. > That is fine to me. In the updated patch, user can specify the directory in command line via variable HOST_DIR. > + > +proc ${board}_download { board src dest } { > + global env board_type > + global host_dir > + > + if { [llength $dest] > 0 } { > + set destfile [lindex $dest 0] > + } else { > + set destfile [file tail $src] > + } > > This doesn't feel right. > I realize /usr/share/dejagnu/remote.exp:remote_download > checks for whether the third parameter can be a list, but > remote_download is a varargs function (the name of the last > variable is "args") and is not a "board" function. > Other ${foo}_download functions that are actual "board" functions, > e.g., /usr/share/dejagnu/remote.exp:standard_download, > or gdb/testsuite/boards/remote-stdio-gdbserver.exp, > don't treat the third parameter as if it can be a list. Yes, remote_download acts as a wrapper or an adapter to "board" functions which are defined in board files. In tcl, simple string is also list, see, % llength "foo" 1 % lindex "foo" 0 foo The code above is right to me but unnecessary. Use dest as a string in the updated patch. diff --git a/gdb/testsuite/boards/local-remote-host-native.exp b/gdb/testsuite/boards/local-remote-host-native.exp new file mode 100644 index 0000000..1119c2d --- /dev/null +++ b/gdb/testsuite/boards/local-remote-host-native.exp @@ -0,0 +1,80 @@ +# Copyright 2014 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 . + +# This file is a dejagnu "board file" and is used to run the testsuite +# against local host, in remote host mode. +# +# This board file is used to emulate the real remote host testing, in +# which file system of host and build are not shared. This is achieved +# by copying files from source directory to ${host_dir}. +# +# To use this file: +# bash$ cd ${build_dir}/gdb +# bash$ make check RUNTESTFLAGS="--host_board=local-remote-host-native --target_board=local-remote-host-native HOST_DIR=/tmp/foo/" +# +# We set both target board and host board together to test a native gdb +# (host == target) on a remote host (host != build). $HOST_DIR is the +# directory for copying files to, to avoid messing up your HOME. When +# it is absent, files are copied to ./remote-host. + +if { $board_type == "target" } { + set_board_info compiler gcc +} + +global GDB +set GDB [file join [pwd] "../gdb"] + +set_board_info hostname 127.0.0.1 + +set_board_info username $env(USER) + +# The ssh key should be correctly set up that you ssh to 127.0.0.1 +# without having to type password. +set_board_info rsh_prog /usr/bin/ssh +set_board_info rcp_prog /usr/bin/scp +set_board_info file_transfer "rsh" + +if { ![info exists HOST_DIR] } { + set HOST_DIR [file join [pwd] "remote-host"] +} + +if { $board_type == "host" } { + set_board_info gdb_opts "-d \"${HOST_DIR}\"" +} + +proc ${board}_spawn { board cmd } { + global board_info + + set remote [board_info $board hostname] + set username [board_info $board username] + set RSH [board_info $board rsh_prog] + + spawn $RSH -t -l $username $remote $cmd + set board_info($board,fileid) $spawn_id + return $spawn_id +} + +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] + file copy -force $src $destfile + + return $destfile +}