Message ID | 570D501E.1020603@ericsson.com |
---|---|
State | Committed |
Headers |
Received: (qmail 62164 invoked by alias); 12 Apr 2016 19:44:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 61450 invoked by uid 89); 12 Apr 2016 19:44:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 12 Apr 2016 19:44:33 +0000 Received: from EUSAAHC007.ericsson.se (Unknown_Domain [147.117.188.93]) by usplmg20.ericsson.net (Symantec Mail Security) with SMTP id B1.25.09012.D994D075; Tue, 12 Apr 2016 21:16:45 +0200 (CEST) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.95) with Microsoft SMTP Server id 14.3.248.2; Tue, 12 Apr 2016 15:44:30 -0400 Subject: Re: [PATCH] gdbserver-base.exp: Copy file to standard output directory in ${board}_download To: Pedro Alves <palves@redhat.com>, <gdb-patches@sourceware.org> References: <1460483287-23953-1-git-send-email-simon.marchi@ericsson.com> <570D39A7.7040001@redhat.com> <570D403F.5010406@ericsson.com> <570D4262.90201@redhat.com> CC: <qiyaoltc@gmail.com> From: Simon Marchi <simon.marchi@ericsson.com> Message-ID: <570D501E.1020603@ericsson.com> Date: Tue, 12 Apr 2016 15:44:30 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <570D4262.90201@redhat.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes |
Commit Message
Simon Marchi
April 12, 2016, 7:44 p.m. UTC
On 16-04-12 02:45 PM, Pedro Alves wrote: > On 04/12/2016 07:36 PM, Simon Marchi wrote: >> On 16-04-12 02:08 PM, Pedro Alves wrote: >>> On 04/12/2016 06:48 PM, Simon Marchi wrote: >>> >>>> proc ${board}_download { board host dest } { >>>> + file copy -force $host [standard_output_file $dest] >>>> return $host >>>> } >>> >>> I think this should be: >>> >>> set dest [standard_output_file $dest] >>> file copy -force $host $dest >>> return $dest >> >> Doh, you're right. >> >>> Don't we need to consider the case of $dest being an absolute path? >> >> I thought it wouldn't be better not, since we don't even want for tests to >> be able to write outside the standard output directory. I guess that if a >> test tries to download to /foo/bar, it will end up as >> outputs/gdb.blah/thetest/foo/bar. Then I would say the test would be at fault. > > OK, but I think we should put a comment to the effect in place. After all, > we'll be pointing other people that run into this in their boards to this > commit. :-) > > Otherwise LGTM. (Let's wait a bit to give Yao a chance to comment though.) Good idea. And if that's ok, I'd put the same comment in gdb_remote_download. What do you think about this? From 4460bbb1367d910e48f4887fe2eb5372245200cc Mon Sep 17 00:00:00 2001 From: Simon Marchi <simon.marchi@ericsson.com> Date: Tue, 12 Apr 2016 11:31:58 -0400 Subject: [PATCH] gdbserver-base.exp: Copy file to standard output directory in ${board}_download gdbserver-base.exp is used as the base for both native-gdbserver.exp and native-extended-gdbserver.exp. (Despite its name, it should really be considered as a "local-gdbserver-base", as it's not really appropriate to implement a remote gdbserver board.) Currently, the _download procedure is implemented as a no-op (it returns the source file path). Because of the SONAME change, The fast tracepoint tests now require the executable and the IPA (libinproctrace.so) to be located in the same directory (see [1]). When using the native-gdbserver board, because _download returns the original file path, the executable does not end up in the same directory as the library, and it fails to execute. In more general terms, with the recent changes, the testsuite now assumes that when it does ${board}_download <source path 1> <destination path 1> ${board}_download <source path 2> <destination path 2> where the destination paths are relative (generally just the file name), both files will end up in the same base directory. That assumption does not hold for the current implementation in gdbserver-base.exp. The proper fix would be to make native-gdbserver non-remote, so that gdb_remote_download would not call DejaGnu's remote_download (see [2]). We could then get rid of ${board}_download in gdbserver-base.exp. However, that will likely take some time to complete. In the mean time, in order to make the fast tracepoint tests pass, we can simply copy the file to the standard output directory. Basically, it just mimics what gdb_remote_download would do if the board wasn't flagged as remote. Note that I missed these failures originally because I had a libinproctrace.so in /usr/local/lib. So, even though libinproctrace.so wasn't copied to the test output directory, it did find the one in /usr/local/lib. It would be nice to find a way to protect against this, as it could easily happen again... Regtested with unix, native-gdbserver and native-extended-gdbserver, and didn't see anything notable, except the ftrace tests now passing for native-gdbserver. [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=6e774b13c3b81ac2599812adf058796948ce7e95 [2] https://sourceware.org/ml/gdb-patches/2016-04/msg00112.html gdb/testsuite/ChangeLog: * boards/gdbserver-base.exp (${board}_download): Copy source file to standard output directory. --- gdb/testsuite/boards/gdbserver-base.exp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Comments
On 04/12/2016 08:44 PM, Simon Marchi wrote: > On 16-04-12 02:45 PM, Pedro Alves wrote: >> On 04/12/2016 07:36 PM, Simon Marchi wrote: >>> On 16-04-12 02:08 PM, Pedro Alves wrote: >>>> Don't we need to consider the case of $dest being an absolute path? >>> >>> I thought it wouldn't be better not, since we don't even want for tests to >>> be able to write outside the standard output directory. I guess that if a >>> test tries to download to /foo/bar, it will end up as >>> outputs/gdb.blah/thetest/foo/bar. Then I would say the test would be at fault. >> >> OK, but I think we should put a comment to the effect in place. After all, >> we'll be pointing other people that run into this in their boards to this >> commit. :-) >> >> Otherwise LGTM. (Let's wait a bit to give Yao a chance to comment though.) > > Good idea. And if that's ok, I'd put the same comment in gdb_remote_download. > > What do you think about this? Fine with me. Thanks, Pedro Alves
diff --git a/gdb/testsuite/boards/gdbserver-base.exp b/gdb/testsuite/boards/gdbserver-base.exp index b686204..02a9244 100644 --- a/gdb/testsuite/boards/gdbserver-base.exp +++ b/gdb/testsuite/boards/gdbserver-base.exp @@ -41,7 +41,14 @@ proc ${board}_file { dest op args } { } proc ${board}_download { board host dest } { - return $host + # We pass DEST in standard_output_file, regardless of whether it is absolute + # or relative, because we don't want the tests to be able to write outside + # their standard output directory. + set dest [standard_output_file $dest] + + file copy -force $host $dest + + return $dest } proc ${board}_upload {dest srcfile args} {