From patchwork Wed Feb 28 03:29:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 26117 Received: (qmail 69213 invoked by alias); 28 Feb 2018 03:29:38 -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 69202 invoked by uid 89); 28 Feb 2018 03:29:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=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: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 28 Feb 2018 03:29:36 +0000 Received: from ESESSHC020.ericsson.se (Unknown_Domain [153.88.183.78]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id EC.86.26548.D12269A5; Wed, 28 Feb 2018 04:29:33 +0100 (CET) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC020.ericsson.se (153.88.183.78) with Microsoft SMTP Server (TLS) id 14.3.352.0; Wed, 28 Feb 2018 04:29:33 +0100 Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Wed, 28 Feb 2018 04:29:32 +0100 Received: from NAM01-BY2-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Wed, 28 Feb 2018 04:29:32 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.lan (192.222.251.162) by MW2PR1501MB2010.namprd15.prod.outlook.com (2603:10b6:302:c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Wed, 28 Feb 2018 03:29:30 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] testsuite: Restore gdb_is_target_remote_prompt Date: Tue, 27 Feb 2018 22:29:15 -0500 Message-ID: <1519788555-25457-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: YTXPR0101CA0030.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00::43) To MW2PR1501MB2010.namprd15.prod.outlook.com (2603:10b6:302:c::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21b4ec2f-364b-4092-5c7b-08d57e5b7ae1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:MW2PR1501MB2010; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2010; 3:g5Et7OnFAwhtpjGR3LT9yiy6VyUT1bGbqpTDYoxwCSwUkGz7MewL+g++cwtczlpbfo9MLoXNmsp/mdAHXD72og1rPwoM3DyRSSCzaI4PLYXeTo5U8EdleDnpj+I7xcxuqVMo/MSkiNA4nkC/HSmyI1molcgY9byLpgi6srqmvNJ64tv+rZvr/h5eMLXc2fIolC6snbRb6SNoKV0r9fP5ir4CR8unEar4xdQsWisIA87I3rt9NgXDJGiOwWZNWxoL; 25:XdkzLrPPuVLqQOLZ764r7+LkYC1LA7AW6hhZJSpBaNCSRH+C72MVW3HIRzR4uV7pqUTfIyG3GRhbLMn1wW0odV0ko5tAgZFtyHAurIAVNBkeBksejlZz+D9T/H3u5BGrhLR0TdWtuWnrtj4cj/toBMvHzN7poSFHZeOLYUVFMJ/bXx48Tqmr9TWwV0VJ34oeYFEK3ht5XIWCeRnCANfiELfl0D9F0uNGSzlfhvVHnMYdHDzoqnjfTRfvBLftH6riIaQ52YceKR1CYGc+Go7Rfl+iOWy3Rtda+TeGZyAweMvMGPHO7JKTnOKrdIsj+yrdrqZX2rXVV1+E7GvfFZ+O4g==; 31:bkhZdq3uvFOCmLWJSEytUkUyHRWcOBT+8M5B8ptluopfip/oaBTTmLZUCB1/ABq4HhqVk//ZgOQcWAhefybEpE3ph2otBRMdvNtjyvWEcBGzVApanFrmBkowrgLFHachwMDa7urhVyQmTwZ/WApdID5uf+xzqPyWCiKdAkUtHT+ixwi6i4wjsDzTevR/dSo7eMbHPu5fccY0n9MMUDU0qMmaUjHU5NtcZbFpWp4XQJc= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2010: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2010; 20:LEZAVjdHz47wH0ttDqMytPOaHW0aMUe80c0zH5324KodSDflMu6KRmjRnk2uCLeiZzXx6AdpZViAhhJHc+RNT1R2aHbo/KF8WPdBRQJl6kzQu4FTQQJIZJQbgbtDfaCLD1rdJvtgO2MPLgsjN+jW98O3AFZKuTI7IUyExAFmmCaO+E1KYVJAwPy3qiVut8THH5pOtF6Ps6GAS0jVRMIPFShdF7gKv3yDdTnitSyFuwg4vmOkah9wca24iRSwhQs1PC9vweH5UEOs6Lbu/1eT5TsmU6BD64Hb7+CrKf8LIGO1uwAAYBURFREUCJm3x7e2+IL3KK8ufWd+W/H7sBbaLL8Rz7rhdiBqGwkDVLmmqD9JF8/uumEEp6+1d2goYNS9h3Fs5g58lCNtzZYMDcLLUp0aHqqnEWJhl2CmfEISJRKKIzToYVop+0qDpFDsoUlaa12EE0frniTvTrrR8Mz3dWGVvFEyQKwjLRXd7ZLLyegAas4UKwBOzUAG+ilxkDyE; 4:gyMFXEwK+B7Dq4U6q9Nc6GCqmrYY+NeDxpUEPjX3zVGna5vhg9jUH0I6pFGI/JYLBSlm6SoJRx3VDHtKaWS7FXC/+bCYUE7P/yFf9zan4C75zBtwtdpIB45zt5d/KOvQM5GerBYaMqTP1WrYZPJDXKEv0yEeoxM2bf/KjdYaxGazWkf5KnjCpQaD/CAnW1f0W6dJGH6xFo9FGyXylIN6rD1n0eaqjtWtrkR73RuJcVz3+g0JTM9FdiOZl6ZCOzfoPAZkE8eus6eF68NYBVkt6A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(3231220)(944501161)(52105095)(3002001)(10201501046)(93006095)(93001095)(6041288)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:MW2PR1501MB2010; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2010; X-Forefront-PRVS: 0597911EE1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(39860400002)(396003)(366004)(376002)(54534003)(199004)(189003)(105586002)(6506007)(53936002)(6116002)(3846002)(2351001)(8676002)(97736004)(51416003)(106356001)(186003)(81166006)(16526019)(386003)(1857600001)(81156014)(8936002)(478600001)(66066001)(36756003)(25786009)(2361001)(4326008)(5660300001)(21086003)(86362001)(2906002)(107886003)(47776003)(68736007)(6486002)(6666003)(52116002)(7736002)(50226002)(50466002)(69596002)(6916009)(48376002)(16586007)(305945005)(316002)(26005)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2010; H:elxacz23q12.lan; 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; MW2PR1501MB2010; 23:B2mgOe6sJPFOxA6/QaTG1CbyMAGsMHZtreDLyw3?= =?us-ascii?Q?EMUn4QEpkd++WoNP/XWrS5KHSBVeCY1wkTzUOGrKRVYUiBbRPIqwd8PfKKOl?= =?us-ascii?Q?pIAyOgpAENWjwtuYJLiBypjE0IFIOEgmYMkX+cAP+Cj3HkLL6qIHq8GQ6Ieg?= =?us-ascii?Q?MF2Nx5p+abPO/DPmgaHb0+pFxaMN/RHtHXtqid0ISFup2qAiavy9jrmdyDRW?= =?us-ascii?Q?6q552TYHQ47n2YkdlqVXRqQzGrykRkw+Hl6PfwlEcHvYbBnT29LbgFgE1az+?= =?us-ascii?Q?Fd6UuTOhCJr1kLtdNqJb16T2RozKq/RurBZUinkEHsO9ysvbGqCYfTRQp/ok?= =?us-ascii?Q?VAeiSVqqHEWJXmzxq0/Wy6rtX15es6Q5WSWuzb8wV6UMALgD0uzv/STxJ1ea?= =?us-ascii?Q?wzWC3UaQ07PCR3U6REXRQNkwvmxgYw9nZb/iSG0XO74sHhOKO94uXNggo+qX?= =?us-ascii?Q?2iQh6vQm9CxD7I903AS6m0f8YbUBNcCYOOFY2FMhorx+2ROQh1vyQg+DmJov?= =?us-ascii?Q?AahGDywFvW40xDJBDBmLmqV0Yno3+PABIQ0/gqAhQHdV9SSZ66QpO8H8Xj76?= =?us-ascii?Q?gma/4RCFn2df8i58ARkeK/8BIYiyCkvzHFYl9l1hA8YjKNdv+xTPPHfK+liK?= =?us-ascii?Q?pOH0iHx9QDtSkYXzPhy0wl64gLTvbXTHPMTUzfJH6BspfxqpTm5XCdeMpWSx?= =?us-ascii?Q?OUeXMI5kb3V3+0rBz/t85KgXXoZkf6FtL81frtkRVfeQ5wKQHULpAwobvlei?= =?us-ascii?Q?3uw/gmiAe4cLzmoDk/wHqyLTfV6F4yaXrEO9GRvxA3fpuOg70Pl3jt0TsuXa?= =?us-ascii?Q?rMAfVGp3kXYm8ue3RcBU1tU5shHMOkXobmj/4PuY7cK/5gC7eWDyRMp8B6lf?= =?us-ascii?Q?4KS8q2rb8KWjxqMKMvnoN8fsWNSXoNsaCfqndYCmIGnDHaqNzXYFAwhIGQL3?= =?us-ascii?Q?44w0H9zQ08E0+YRyZBplqQomcLSCT3k7r/dlWAptPATD70nDmWpkRQckSP5Q?= =?us-ascii?Q?4YY7Zp5Hl2bWjxISD4jtQu076Nic5wvNuPo4PVRfhPFXksXXSeXss2XFk4YR?= =?us-ascii?Q?7aUK7eiSX94GNNa+ay5toQi4a/nSIv34U7H2oOWrUe4DKUT4GrhHDPvionZt?= =?us-ascii?Q?RBlNy+JaC4U35jUBqbFMF2DE2v/KsDuhPXbIt62ZgD0f6Q1RVI93E4cNXAx0?= =?us-ascii?Q?uGFf3xIpEmw/T6mNj6CrMNFpSPrBm2EQZf4gH?= X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2010; 6:mZqNwjGN4cpYBfKr46Vlw1PP49G2G/ay7RrPFG7zLJDvcyCq484BHxpBylbaI3EQAA+lmKfuS0b672UCLFkFIosmHPJlWIGMmm1RcOkGpaOmRW1T0nuyIj5BmW4XDYkUCGEZDEgzIrRYATI5RqddBGWL2UAKdyF/A0Ha0J+EkgrK0IBQmQJGuPh2SYEMAZ2YBEvlXQD7cVkIoa2eBjgPmMTlPlsN180BMFSqU8U5bQ+Gh0aPTlIVfNNMaAEIWduMDN08pTPzMqidbnue8NXlRZeiK/sDFLXiUXU9iNF4luFNgCTkk2h4drlRRz9kKCn+609eXIARy+YsoREQ63apEiYv8bUNcDK/P0WgpPvt9QE=; 5:qKALR7sQC/aaOXKUgxlDMmT1YBB1L9hQrrSdf4BKBeyWyXpdi7tyeVQOvXPa9Q2S19g2TH6ZtS8/rbxMXOoTQJJlE1E0uYeKZtr9gS+M8otwXzFwgl2H1+Yf6bU5CoMZ/vTVoxzoQhv6IDtYJpgFR1tXrrHtgeUWu/zI8UEJCEM=; 24:YYZ14DB+l3X5/ab+rc0tqeSUUJT9+CukOsTJ+ABSU7xByswLBNP8sS8g8TWS7Ak30kdHb0n8X9almshj7iAHvRgqGgqTRHoBmaYxup4mJxk=; 7:fYKzaT+hHa2v3+swYd9dP3TA1VxrDJwvRtprPQ+x6JaDTXfh6Ep4nlceZg/ilnVXqjYLjwal7J0Wrpyd/q6slieDtyaZmIDUw+CoUWP507YQshnprSYjkjt0YVcqQuj9XZXsAgyQl1CI+3kdhQfGcG49tTAaeJEyawoiUG+eUjxQ1ecnAjSrCeecwSU+E46aSnqRItNvSn0P7X+oUEBMV/gRqI8dDM3Ljs1COOBtX3E5tOK2U771ab1LAkfKqtzU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2018 03:29:30.8068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21b4ec2f-364b-4092-5c7b-08d57e5b7ae1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2010 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes In patch Add test for load command 3275ef477498e0500d7ea440f1bc51787acf4610 I removed gdb_is_target_remote_prompt, but did not realize it was used in mi_is_target_remote. This makes the gdb.mi/mi-nonstop.exp crash, for example. This patch restores it. gdb/testsuite/ChangeLog: * lib/gdb.exp (gdb_is_target_1): Add prompt_regexp parameter and use it. (gdb_is_target_remote_prompt): New proc. (gdb_is_target_remote): Use gdb_is_target_remote_prompt. (gdb_is_target_native): Pass prompt parameter to gdb_is_target_1. --- gdb/testsuite/lib/gdb.exp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3cd10dc..9102e54 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3157,13 +3157,10 @@ proc skip_compile_feature_tests {} { # Helper for gdb_is_target_* procs. TARGET_NAME is the name of the target # we're looking for (used to build the test name). TARGET_STACK_REGEXP # is a regexp that will match the output of "maint print target-stack" if -# the target in question is currently pushed. - -proc gdb_is_target_1 { target_name target_stack_regexp } { - global gdb_prompt - - set prompt_regexp "$gdb_prompt $" +# the target in question is currently pushed. PROMPT_REGEXP is a regexp +# matching the expected prompt after the command output. +proc gdb_is_target_1 { target_name target_stack_regexp prompt_regexp } { set test "probe for target ${target_name}" gdb_test_multiple "maint print target-stack" $test { -re "${target_stack_regexp}${prompt_regexp}" { @@ -3177,17 +3174,27 @@ proc gdb_is_target_1 { target_name target_stack_regexp } { return 0 } +# Helper for gdb_is_target_remote where the expected prompt is variable. + +proc gdb_is_target_remote_prompt { prompt_regexp } { + return [gdb_is_target_1 "remote" ".*emote serial target in gdb-specific protocol.*" $prompt_regexp] +} + # Check whether we're testing with the remote or extended-remote # targets. proc gdb_is_target_remote { } { - return [gdb_is_target_1 "remote" ".*emote serial target in gdb-specific protocol.*"] + global gdb_prompt + + return [gdb_is_target_remote_prompt "$gdb_prompt $"] } # Check whether we're testing with the native target. proc gdb_is_target_native { } { - return [gdb_is_target_1 "native" ".*native \\(Native process\\).*"] + global gdb_prompt + + return [gdb_is_target_1 "native" ".*native \\(Native process\\).*" "$gdb_prompt $"] } # Return the effective value of use_gdb_stub.