From patchwork Mon Apr 20 10:41:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 6328 Received: (qmail 57474 invoked by alias); 20 Apr 2015 10:41:15 -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 57459 invoked by uid 89); 20 Apr 2015 10:41:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 20 Apr 2015 10:41:13 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 20C938EFD4 for ; Mon, 20 Apr 2015 10:41:12 +0000 (UTC) Received: from blade.nx (ovpn-116-95.ams2.redhat.com [10.36.116.95]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3KAfBBq009947; Mon, 20 Apr 2015 06:41:11 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 562E9264117; Mon, 20 Apr 2015 11:41:10 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Sergio Durigan Junior Subject: [OB PATCH] Fix three test failures with extended remote targets Date: Mon, 20 Apr 2015 11:41:09 +0100 Message-Id: <1429526469-8992-1-git-send-email-gbenson@redhat.com> In-Reply-To: <87lhhqwccb.fsf_-_@redhat.com> References: <87lhhqwccb.fsf_-_@redhat.com> X-IsSubscribed: yes Hi all, This commit fixes three gdb.base/attach.exp failures when using extended remote targets. The failures occurred because GDB now locates and loads files when attaching on remote targets if the remote target supports qXfer:exec-file:read; the filenames were shown but with "target:" prefixes which the test has been updated to handle. Thanks Sergio for spotting the failure and narrowing it down to a specific commit (and for doing all the buildbot stuff you do generally!) Cheers, Gary gdb/testsuite/ChangeLog: * gdb.base/attach.exp: Fix three extended remote failures. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/attach.exp | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index 38b19b5..f2ebe3a 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -66,6 +66,19 @@ proc do_attach_tests {} { global subdir global timeout + # Figure out a regular expression that will match the sysroot, + # noting that the default sysroot is "target:", and also noting + # that GDB will strip "target:" from the start of filenames when + # operating on the local filesystem + set sysroot "" + set test "show sysroot" + gdb_test_multiple $test $test { + -re "The current system root is \"(.*)\"\..*${gdb_prompt} $" { + set sysroot $expect_out(1,string) + } + } + regsub "^target:" "$sysroot" "(target:)?" sysroot + # Start the program running and then wait for a bit, to be sure # that it can be attached to. @@ -219,17 +232,17 @@ proc do_attach_tests {} { set test "attach2, with no file" set found_exec_file 0 gdb_test_multiple "attach $testpid" "$test" { - -re "Attaching to process $testpid.*Load new symbol table from \"$escapedbinfile\.exe\".*y or n. $" { + -re "Attaching to process $testpid.*Load new symbol table from \"$sysroot$escapedbinfile\.exe\".*y or n. $" { # On Cygwin, the DLL's symbol tables are loaded prior to the # executable's symbol table. This in turn always results in # asking the user for actually loading the symbol table of the # executable. - gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \ + gdb_test "y" "Reading symbols from $sysroot$escapedbinfile\.\.\.*done." \ "$test (reset file)" set found_exec_file 1 } - -re "Attaching to process $testpid.*Reading symbols from $escapedbinfile.*main.*at .*$gdb_prompt $" { + -re "Attaching to process $testpid.*Reading symbols from $sysroot$escapedbinfile.*main.*at .*$gdb_prompt $" { pass "$test" set found_exec_file 1 } @@ -298,7 +311,7 @@ proc do_attach_tests {} { "before attach3, flush exec" gdb_test "attach $testpid" \ - "Attaching to process $testpid.*Reading symbols from $escapedbinfile.*main.*at .*" \ + "Attaching to process $testpid.*Reading symbols from $sysroot$escapedbinfile.*main.*at .*" \ "attach when process' a.out not in cwd" set test "after attach3, exit"