From patchwork Tue Jun 5 18:19:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27638 Received: (qmail 86821 invoked by alias); 5 Jun 2018 18:20:23 -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 85699 invoked by uid 89); 5 Jun 2018 18:20:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 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.2 spammy= X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 05 Jun 2018 18:20:19 +0000 Received: from ESESSHC007.ericsson.se (Unknown_Domain [153.88.183.39]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id 16.2A.00712.F54D61B5; Tue, 5 Jun 2018 20:20:15 +0200 (CEST) Received: from ESESSMR502.ericsson.se (153.88.183.110) by ESESSHC007.ericsson.se (153.88.183.39) with Microsoft SMTP Server (TLS) id 14.3.382.0; Tue, 5 Jun 2018 20:20:15 +0200 Received: from ESESSMB502.ericsson.se (153.88.183.163) by ESESSMR502.ericsson.se (153.88.183.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Tue, 5 Jun 2018 20:20:15 +0200 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Tue, 5 Jun 2018 20:20:14 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by SN6PR15MB2399.namprd15.prod.outlook.com (2603:10b6:805:24::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.15; Tue, 5 Jun 2018 18:20:11 +0000 From: Simon Marchi To: CC: , Simon Marchi Subject: [PATCH] Fix "info registers" regexes in gdb.base/jit-reader.exp Date: Tue, 5 Jun 2018 14:19:51 -0400 Message-ID: <1528222791-10116-1-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1517658143-946-1-git-send-email-b7.10110111@gmail.com> References: <1517658143-946-1-git-send-email-b7.10110111@gmail.com> MIME-Version: 1.0 X-ClientProxiedBy: SN4PR0201CA0056.namprd02.prod.outlook.com (2603:10b6:803:20::18) To SN6PR15MB2399.namprd15.prod.outlook.com (2603:10b6:805:24::19) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR15MB2399: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Forefront-PRVS: 0694C54398 Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Office365-Filtering-Correlation-Id: d322889d-7c3c-428f-f2a7-08d5cb10fa46 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 18:20:11.8537 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d322889d-7c3c-428f-f2a7-08d5cb10fa46 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR15MB2399 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes Commit e813d34 ("Align natural-format register values to the same column") changed the output of "info registers" (tabs to spaces), but didn't update gdb.base/jit-reader.exp. Update the regexes to expect spaces instead. For some reason, this test is skipped by the buildbot (even in the native x86-64 configuration), so we missed it. We will need to investigate why... gdb/testsuite/ChangeLog: * gdb.base/jit-reader.exp (jit_reader_test): Expect spaces in "info registers" output. --- gdb/testsuite/gdb.base/jit-reader.exp | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 7a1e287..2ed7410 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -67,30 +67,30 @@ proc info_registers_current_frame {sp} { gdb_test "info registers" \ [multi_line \ - "rax $hex $decimal" \ - "rbx $hex $decimal" \ - "rcx $hex $decimal" \ - "rdx $hex $decimal" \ - "rsi $hex $decimal" \ - "rdi $hex $decimal" \ - "rbp $hex $hex" \ - "rsp $sp $sp" \ - "r8 $hex $decimal" \ - "r9 $hex $decimal" \ - "r10 $hex $decimal" \ - "r11 $hex $decimal" \ - "r12 $hex $decimal" \ - "r13 $hex $decimal" \ - "r14 $hex $decimal" \ - "r15 $hex $decimal" \ - "rip $hex $hex$any" \ - "eflags $hex \\\[$any\\\]" \ - "cs $hex $decimal" \ - "ss $hex $decimal" \ - "ds $hex $decimal" \ - "es $hex $decimal" \ - "fs $hex $decimal" \ - "gs $hex $decimal" \ + "rax $hex +$decimal" \ + "rbx $hex +$decimal" \ + "rcx $hex +$decimal" \ + "rdx $hex +$decimal" \ + "rsi $hex +$decimal" \ + "rdi $hex +$decimal" \ + "rbp $hex +$hex" \ + "rsp $sp +$sp" \ + "r8 $hex +$decimal" \ + "r9 $hex +$decimal" \ + "r10 $hex +$decimal" \ + "r11 $hex +$decimal" \ + "r12 $hex +$decimal" \ + "r13 $hex +$decimal" \ + "r14 $hex +$decimal" \ + "r15 $hex +$decimal" \ + "rip $hex +$hex$any" \ + "eflags $hex +\\\[$any\\\]" \ + "cs $hex +$decimal" \ + "ss $hex +$decimal" \ + "ds $hex +$decimal" \ + "es $hex +$decimal" \ + "fs $hex +$decimal" \ + "gs $hex +$decimal" \ ] } @@ -177,8 +177,8 @@ proc jit_reader_test {} { "rdx " \ "rsi " \ "rdi " \ - "rbp $hex $hex" \ - "rsp $caller_sp $caller_sp" \ + "rbp $hex +$hex" \ + "rsp $caller_sp +$caller_sp" \ "r8 " \ "r9 " \ "r10 " \ @@ -187,7 +187,7 @@ proc jit_reader_test {} { "r13 " \ "r14 " \ "r15 " \ - "rip $hex $hex $any" \ + "rip $hex +$hex $any" \ "eflags " \ "cs " \ "ss " \