From patchwork Fri Aug 9 20:54:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandra Loosemore X-Patchwork-Id: 34026 Received: (qmail 48194 invoked by alias); 9 Aug 2019 20:54:14 -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 48186 invoked by uid 89); 9 Aug 2019 20:54:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: esa1.mentor.iphmx.com Received: from esa1.mentor.iphmx.com (HELO esa1.mentor.iphmx.com) (68.232.129.153) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 09 Aug 2019 20:54:12 +0000 IronPort-SDR: MlORLDiwFWMYYfHHJedEPJXo+14ysyB9rXlmufYodClrpxcD9b9+hVCvHG7sFo76xsQBuXDKua 0zHlbg+fOKHl1qQ6rd8XzURgnOK2l1DNDyZuaQPD1SGcBvYrpVjGhH8P7v/FUoRD0CUGp9cFI/ YQqWs0PtMCpsKzSMemHrNzY828WETjiyOiszN2V2blSq3eeiJOZCrsK4O3GaGW9OKOGalDODCp dl51NVCp1THFRMgk5HOWYFNDW7gWODC1O8MablJrkqiorZx2d4bF7yEbMgf2tBe76KsIiVj5G6 pD8= Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 09 Aug 2019 12:54:11 -0800 IronPort-SDR: zvhZ5GM8Sr8xgnOvBQWDtt23vdr1B3cTamRrw5wtIFTa/t7K82BxNBZYL7oWsbm7Qb2E67OdFy n/4qU98+RLn0SmBQAnu5iSPkkpow6vjeJ2kjYCOr2RPtAjhUq78dSZfD+gUQYZq+CHrur4lotm 8lWv8khIizhTyXhty7xGAt5YkP0xVdH75tWHq74sW2QA94Kus3KdcN8FapuosNf5R/PMSmcqqX x91yNGXbFGAvqQSJcIpuI5CqRIf7djHeGKilRE/8XtGkaUhxTTGMsRR/s1BF+dhhqFkgzvJoLu GtI= To: "gdb-patches@sourceware.org" From: Sandra Loosemore Subject: [testsuite, obvious] Match Windows pathnames in gdb.linespec/break-ask.exp Message-ID: Date: Fri, 9 Aug 2019 14:54:05 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Return-Path: sandra@codesourcery.com gdb.linespec/break-ask.exp has been ERRORing on Windows host because its pathname regexps had hardwired "/" directory separators while GDB was printing "\". This patch fixes the regexps to match both Posix and Windows filename syntax. I thought this was sufficiently obvious that I went ahead and checked it in (there's no change to the logic of the test). -Sandra commit 020a839d52fb8a28059dadd075b09a2fec84ef74 Author: Sandra Loosemore Date: Fri Aug 9 13:45:44 2019 -0700 Match Windows pathnames in gdb.linespec/break-ask.exp. 2019-08-09 Sandra Loosemore gdb/testsuite/ * gdb.linespec/break-ask.exp: Generalize regexps to match Windows pathnames too. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index eaf6390..ddd8155 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-09 Sandra Loosemore + + * gdb.linespec/break-ask.exp: Generalize regexps to match + Windows pathnames too. + 2019-08-08 Tom de Vries PR testsuite/24862 diff --git a/gdb/testsuite/gdb.linespec/break-ask.exp b/gdb/testsuite/gdb.linespec/break-ask.exp index f5928ab..4474154 100644 --- a/gdb/testsuite/gdb.linespec/break-ask.exp +++ b/gdb/testsuite/gdb.linespec/break-ask.exp @@ -53,7 +53,7 @@ gdb_test_no_output "set filename-display absolute" set cmd "break twodup" set test "break twodup absolute" gdb_test_multiple $cmd $test { - -re "^$cmd\r\n\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] \[^\r\n\]+/base/one/thefile\\.cc:twodup\\\(\\\)\r\n\\\[3\\\] \[^\r\n\]+/base/two/thefile\\.cc:twodup\\\(\\\)\r\n> $" { + -re "^$cmd\r\n\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] \[^\r\n\]+base.one.thefile\\.cc:twodup\\\(\\\)\r\n\\\[3\\\] \[^\r\n\]+base.two.thefile\\.cc:twodup\\\(\\\)\r\n> $" { pass $test } } @@ -75,7 +75,7 @@ gdb_breakpoint "body_elsewhere" gdb_run_cmd gdb_test "" "Breakpoint \[0-9\]+, twodup \\(\\) at thefile.cc:\[0-9\]+\r\n.*" "expect breakpoint" -gdb_test "info source" "\r\nLocated in \[^\r\n\]+/base/one/thefile\\.cc\r\n.*" +gdb_test "info source" "\r\nLocated in \[^\r\n\]+base.one.thefile\\.cc\r\n.*" gdb_continue_to_breakpoint "body_elsewhere" ".* body_elsewhere marker .*" @@ -95,6 +95,6 @@ gdb_breakpoint "body_elsewhere" gdb_run_cmd gdb_test "" "Breakpoint \[0-9\]+, twodup \\(\\) at thefile.cc:\[0-9\]+\r\n.*" "expect breakpoint other" -gdb_test "info source" "\r\nLocated in \[^\r\n\]+/base/two/thefile\\.cc\r\n.*" "info source other" +gdb_test "info source" "\r\nLocated in \[^\r\n\]+.base.two.thefile\\.cc\r\n.*" "info source other" gdb_continue_to_breakpoint "body_elsewhere other" ".* body_elsewhere marker .*"