From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10789 invoked by alias); 3 Apr 2013 23:21:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 10779 invoked by uid 89); 3 Apr 2013 23:21:51 -0000 X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 03 Apr 2013 23:21:48 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UNWzz-00030W-4b from Sandra_Loosemore@mentor.com for gdb-patches@sourceware.org; Wed, 03 Apr 2013 16:21:47 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 3 Apr 2013 16:21:47 -0700 Received: from [IPv6:::1] (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.1.289.1; Wed, 3 Apr 2013 16:21:46 -0700 Message-ID: <515CB97A.7010703@codesourcery.com> Date: Thu, 04 Apr 2013 08:13:00 -0000 From: Sandra Loosemore User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: Subject: [patch] avoid remote-host failures in gdb.linespec/linespec.exp Content-Type: multipart/mixed; boundary="------------050200040604060707050308" X-Virus-Found: No X-SW-Source: 2013-04/txt/msg00093.txt.bz2 --------------050200040604060707050308 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Content-length: 809 This patch gets rid of a couple test fails in linespec.exp that we've observed from remote-host i686-mingw32 testing of Canadian cross toolchains for multiple targets. As I observed in my notes on a previous patch http://sourceware.org/ml/gdb-patches/2013-04/msg00053.html in this configuration the test harness copies the source files to the working directory on the remote host and compiles them there, without a directory prefix. So, tests that depend on a directory prefix being present (in this case, to disambiguate files that otherwise have the same name) can't be expected to work. OK to commit? -Sandra 2013-04-03 Sandra Loosemore gdb/testsuite/ * gdb.linespec/linespec.exp (test_class): Make dir/file:line tests conditional for non-remote hosts only. --------------050200040604060707050308 Content-Type: text/x-patch; name="linespec.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="linespec.patch" Content-length: 1372 Index: gdb/testsuite/gdb.linespec/linespec.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.linespec/linespec.exp,v retrieving revision 1.6 diff -u -p -r1.6 linespec.exp --- gdb/testsuite/gdb.linespec/linespec.exp 1 Jan 2013 06:41:24 -0000 1.6 +++ gdb/testsuite/gdb.linespec/linespec.exp 3 Apr 2013 23:11:38 -0000 @@ -43,13 +43,19 @@ if {$l1 != $l2} { error "somebody incompatibly modified the source files needed by linespec.exp" } -gdb_test "break one/thefile.cc:$l1" \ - "Breakpoint $decimal at $hex: file .*thefile.cc, line $l1." \ - "single-location break using dir/file:line" - -gdb_test "clear one/thefile.cc:$l1" \ - "Deleted breakpoint $decimal *" \ - "clear breakpoint using dir/file:line" +# Copying files to a remote host loses the directory prefix during +# compilation. +if { [is_remote host] } { + untested "breakpoints using dir/file:line" +} else { + gdb_test "break one/thefile.cc:$l1" \ + "Breakpoint $decimal at $hex: file .*thefile.cc, line $l1." \ + "single-location break using dir/file:line" + + gdb_test "clear one/thefile.cc:$l1" \ + "Deleted breakpoint $decimal *" \ + "clear breakpoint using dir/file:line" +} gdb_test "break thefile.cc:$l1" \ "Breakpoint $decimal at $hex: thefile.cc:$l1. \[(\]2 locations\[)\]" \ --------------050200040604060707050308--