From patchwork Tue Aug 8 09:40:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 21972 Received: (qmail 51358 invoked by alias); 8 Aug 2017 09:40:55 -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 51339 invoked by uid 89); 8 Aug 2017 09:40:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.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.2 spammy=HX-ClientProxiedBy:sk:HE1PR07, H*r:15.1.1341.9 X-HELO: sesbmg23.ericsson.net Received: from sesbmg23.ericsson.net (HELO sesbmg23.ericsson.net) (193.180.251.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 08 Aug 2017 09:40:53 +0000 Received: from ESESSHC016.ericsson.se (Unknown_Domain [153.88.183.66]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 81.1D.07915.22789895; Tue, 8 Aug 2017 11:40:50 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.66) with Microsoft SMTP Server (TLS) id 14.3.352.0; Tue, 8 Aug 2017 11:40:50 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ki.sw.ericsson.se (192.176.1.81) by DBXPR07MB320.eurprd07.prod.outlook.com (2a01:111:e400:941d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.9; Tue, 8 Aug 2017 09:40:47 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] testsuite: Exclude end-of-line characters from get_valueof result Date: Tue, 8 Aug 2017 11:40:38 +0200 Message-ID: <1502185238-6275-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: HE1PR07CA0025.eurprd07.prod.outlook.com (2603:10a6:7:66::11) To DBXPR07MB320.eurprd07.prod.outlook.com (2a01:111:e400:941d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 46240b09-edd6-447b-51ae-08d4de418ce1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DBXPR07MB320; X-Microsoft-Exchange-Diagnostics: 1; DBXPR07MB320; 3:LeCIzkYkN+sSCkOFdoKtd79s9EzUurvA0dNpu66ZMuk9UMPaAExctKgVzp0XqOLBVybQopVo1emoTR0b+XjxNv7ghBe6CgKhUB1LMi8mIpn3znFXPHSD72r3YYyf1cNLwBR6NADprSQidyd4tv2L0m5dOiyumuG9p9FS7ptYTOFt/2Jcj85be5BlJzWeNEA2NwlGURTvPOOIpjkAN0l/Q4UV8Frb5HNlJ8iW83ZsMmlLs1Ms7ToSuS61t8UXpwBu; 25:0ah4Ue92DXJI0ynFfSUAF2J7GJoSZyC3KPViKW0mOuKzKUpAMCGALQbJ1CBbdE3ZkQ8u2DQg8mSSUQ8+/y3MRUeHtinAfEtTVGWcA71p7vFupQv3r8KkNFqlDddviWPoGySss5B7OkUEq4tjDm6olfQu+GZXuWvykRh1ch/pNfQtzFDltaRo+Lo47rxmXfQABbXDiPtLOshfmqZxjhxBc7SQc6QDc+5uYC+/OPSGtT6vcqkFyAtmkMGHygIDh/YebcBW9FhaW0LWR9GoqLbSaMIC7wfSa7Bm2HeNPXBEpvhn59Y1JWQLZvfa5lFqouDX4tv4fnSgXP3WMQRd9nfTaw==; 31:RAxezC7gYcVH5g6yzcwYFVNq90s1m30tS8aOxPIxsl0ZeoCzWa6zRA15HPwY+MvM5LSghUr7C1Ywte1XeR0YBJr9BDUduxgfrHC4wag9E5OcW8dlqYsR2KFRvHooUPDXrrpu3p7UezFoH/utN+Z8MFYdMsMPoppFVvZ1unyfyBMig68yFen0F9owd7d8QAUsIwnDxU+JJwn9dKZ0XVwDyloXnyNKjHSPp99D3vu8kJs= X-MS-TrafficTypeDiagnostic: DBXPR07MB320: X-Microsoft-Exchange-Diagnostics: 1; DBXPR07MB320; 20:L1iUkxmFn1zdREfYz2VLxaM3SetkkR9TFXFYoznzAMVBy/ZtMuOLzjPN/HEhzcTdvYbqfOmjdaQxh2EL6urLug49/LYMy0PtpDBlii60qNYnZmk1fzv5jhbh4c4YtrC9rsWLaAqpBNymvBknuSjoHPrf1nY2etTu9f9/OGQCW56oinLZJKxdwbmyR0X0JHbsE7pTUUmA+EQHfdI+egYt+DXI1YCxk+/Nn+0GsfLEWbzIRAAXfMYy8DYEr3Bw/bUETEhCa9ztpScpl8DhwVP0NBihSRIoSanaMK3odtaZlOs5v6iepmHApBj2GMPTODEzL1IHmIfrV82gGbv0hYPm9TkLpq0ZVeof4nYf/2B3Mu66HMgbMTxapJ3G3VutYWdNeMBGakhDp+Yz9l9dGRleXy71oz5tco5gOruLWkuKxcdeXp8doCTY09rINfWuyQNDEfDDTEsL6/yxmoBtbI0DTLje5In9WQKhThku6AKMG9R+92et4eW/Pka3cd71H9R5; 4:Tfx2+LG92PqigyjKPOxFIIHLUBy0c2Vbcbt0HP61gqVVPRypDYeVqVkUv84S75IfoFQAUda+yAFlwlu3ukdEJ3g4vHHZlXeeuPfqspP2XSWVAQ54dmYzhPptvebq1EO+f1KlYWTKQnxTORtwXPyWfx9uIdUxhOXroN8Qh7ZZD+gFRWPEws2Y9kvYHFuShjalxrCOxHLfqcV+S2/Zp1eT0/tgpHsgYlqj/tHs6QdV6VDcSy88c9MY9forn4B2E1D8 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123558100)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DBXPR07MB320; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DBXPR07MB320; X-Forefront-PRVS: 03932714EB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(39850400002)(39410400002)(39400400002)(39450400003)(39860400002)(39840400002)(199003)(54534003)(189002)(2361001)(33646002)(101416001)(42186005)(478600001)(2351001)(50986999)(105586002)(4326008)(106356001)(25786009)(7736002)(50466002)(48376002)(305945005)(86362001)(81156014)(36756003)(8676002)(66066001)(81166006)(47776003)(50226002)(6666003)(7350300001)(6916009)(6486002)(230783001)(6506006)(97736004)(5660300001)(2906002)(5003940100001)(110136004)(107886003)(38730400002)(3846002)(68736007)(53936002)(6116002)(189998001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DBXPR07MB320; H:elxacz23q12.ki.sw.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DBXPR07MB320; 23:GwiDc3MTz1VTA4LlZ4VtFusDCb/RYSHKOmj1gtAFMS?= =?us-ascii?Q?2QJGj6kxve7i3gTQqo8U3EBtF/oHetEjDgNaLnfjVnBizNB5vZB0XH0qFxzX?= =?us-ascii?Q?5C5GLi9nJn/NYlKoIbjUQcwX6sNtNTBUF5Z9Uv04KhRuRU1tJOZXqsFh/Pkw?= =?us-ascii?Q?tmTrvL83Ed1jqKGXgseNRmmiTVwnwTYTBnApDGZTXaiNyWecXCfXFXbpU5If?= =?us-ascii?Q?OhVCFw7DZcoxFkpBQuYhGcaGnqL0Dap6nLGRcXFXzqlnvv5VYl/t47MZ2MIA?= =?us-ascii?Q?qITDhB2wdaxAk3GHMjzy9UY8/8lsuX8Ywu7qx91D8yuOcyGKL/LXWSAI3Y9g?= =?us-ascii?Q?g8Tlw1Nk4bfZvE4E5Gwx8ecytJR1urCbxk11xSBoI6LVFO6MyYrDVgtfGfUI?= =?us-ascii?Q?LTLunuvhMGd4H2XRtYMHbdJ1PZtJ6+oODwWHMmGyKLmKw2lJ7HZxmiw52Saq?= =?us-ascii?Q?8aFRIBQpcbbIr2FggXnEXdkeOJPxF5sewggPwv28jY5hSQ5L5XglJnZg9bh+?= =?us-ascii?Q?xL8C5uss+vVTJJ/cgQZOncyUcd6CtmFhdag4zptf4KB7ntIWZtZQK71fuRaK?= =?us-ascii?Q?WTj/jqrb9ELJTRDDZn0Xo67DKTBzkH0X7Oj4kuqWbygBFN/JU1bKnVE6LbHk?= =?us-ascii?Q?SA7fpBceISe12OJsJoXQDzGUDgN9Ee8moU9zZsf9SACKV17NHdZlDpbCBTkf?= =?us-ascii?Q?juPj6Uyo+Rc0zsnWR2tnYqTjwwSv0TIb5iRKBBmY0yNUvi1NKJfV6GmrPFej?= =?us-ascii?Q?e54cSzp2h5boyirtyRpmpZIcDV2ais2hPFIoaVBjvlSVWAiazGhEKeJ/iTMA?= =?us-ascii?Q?zS9JRm07V/D7ejEvjDRBDeIyoH+q9sOEHyeD4CWK52K+aRj91vSci/8LLXUJ?= =?us-ascii?Q?bzQZY446kg2cybob+GhaFgFR7MKuwkIixYNLxKtCufBwqq/vkkenmlFwLqnf?= =?us-ascii?Q?+2uk4yM/oW6cqLTwXejtZAU0qQJjzXg3RGIzkyg59varnfp5UhZ+rzg12dFe?= =?us-ascii?Q?QYCMUoHmCS6Nxtd9sRhALbzt+gy5ZQktjVZW3j04nyHBF0ijJDoaI4vjaZ3i?= =?us-ascii?Q?83uFQ0A2VUzYJfc3J0gb1jHo4RLr9ddtlmXeXBJxDSkBIHkUsPQAxhja11Jf?= =?us-ascii?Q?stFaXsRLBF4hhhBHMU3hH/K/KtmHdCMWM8lYjxQbXtUFXG0oCpcWqHJrAqy9?= =?us-ascii?Q?/xo6pnh3qXX0trlpj7Kop0x4o/EKAsFJrs7S+WK9lfjOY39q9FST7CzfFGRv?= =?us-ascii?Q?IBnnO8QjWHSViR8On2n6s/bkutue6IV9eNdVPLJZ3SYyxvmGet4adlR8A1VN?= =?us-ascii?Q?i3592PwfGJBpsWQk4CthfsASqx4KFOIuu5lRfzymTI?= X-Microsoft-Exchange-Diagnostics: 1; DBXPR07MB320; 6:8xv9CBYxLQ7gtEWdk7etS37zBzsURWOb2cz6dbfGFQf2Op1GojocAE4zm36jPK1JsxE5H97sw53RQF/A0xg9PaoreFOllbdeq2qbb9acbUI49w/yzVyuFahgtjVbr/6SoF/vvYHbkAufg7i3NqoxEz0yC+0Tjzg+3T5ZgSv0cndL/3zWiVHjsi4YpJt9cG7mKFDbpWHnbnJgcY2BWIRQ4VnVVvACqU8Qwd3geY3HgL5oPhTHKTKHnzcj+Khvzr4yP1sIrOOCtatQDQfBWKOpWHX/MJUmFJC+ww+oEoGdD7sMLbULcDmtzUS1vkvrbDkc3FcIs7pXtKAw+zVo9ceNZQ==; 5:81z+bf2Ol/u1zUoek5mVeFnNiiV9uN3VmzDglqwdsKynRAkYyMlH1wFhMHqQI7YvL0ZlW2+2Y+KhMQwLfX1Gf70mk0wlQ7g0H8DM4N1yvZEAvkHmVhxTqTQQFTpkTlPgb0gtS3YH03fP+++8BLpZ0g==; 24:Bg7DFk/px3/mcvVmCeD8MG/WV2m9zdT6bF8CBDkiLEe4sOtbsvD1zeYab1uT99WzeQJ3gYqTA3D9A5zaiRLGCGO5iWVEbFnIQlJkbQ401e8=; 7:EPpeEznuXkNltofZPYpPURVYeYimiETGn7C3/Cv8Ab6YWTsrtIPVF3DycjwVQ4SZyYnWRuEq+w6tnun9nchLJ4UCxacrsia9C0wNiPqWy2N25IZveZ/TEBPXNiebOyf1C6+uFXVuugoIcNRqWL1HWwrBKUVb5HnrcXWhs872yJ2Z79/Xe1P2UeNoZew0OkOpRaUAqxIbGGoV58GlocQJJP5AmZvbJlSQLjJzAB7TDnY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2017 09:40:47.9993 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBXPR07MB320 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes The get_valueof procedure allows tests to conveniently make gdb evaluate an expression an return the value as a string. However, it includes an end-of-line character in its result. I stumbled on this when trying to use that result as part of a regex further in a test. You can see this for example by adding a puts in gdb.dwarf2/implref-struct.exp:get_members: set members [get_valueof "" ${var} ""] puts "<$members>" The output is <{a = 0, b = 1, c = 2} > This is because the regex in get_valueof is too greedy, the captured portion matches anything up to the gdb_prompt, including the end of line characters. This patch changes it to capture everything but end of line characters. The output of the puts becomes: <{a = 0, b = 1, c = 2}> I tested this by running gdb.dwarf2/implref-array.exp and gdb.dwarf2/implref-struct.exp, the two only current users of that procedure. gdb/testsuite/ChangeLog: * lib/gdb.exp (get_valueof): Don't capture end-of-line characters. --- gdb/testsuite/lib/gdb.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3d3eaab..d0265fc 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5537,7 +5537,7 @@ proc get_valueof { fmt exp default {test ""} } { set val ${default} gdb_test_multiple "print${fmt} ${exp}" "$test" { - -re "\\$\[0-9\]* = (.*)\[\r\n\]*$gdb_prompt $" { + -re "\\$\[0-9\]* = (\[^\r\n\]*)\[\r\n\]*$gdb_prompt $" { set val $expect_out(1,string) pass "$test ($val)" }