From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2023.outbound.protection.outlook.com [40.92.98.23]) by sourceware.org (Postfix) with ESMTPS id 2B732383F974 for ; Fri, 24 Jun 2022 14:13:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2B732383F974 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ntpYI1orGKcqQ3dzHPPNylkO4mObWrXJSNO4UhgWhLa3Uf3TuQQkp6GCSgZDQLE5rlLUizk9LcHsGws8ZsocxfUMM6sNPChTE7Ls+YTLMUeBXGLnxIiGq96oMgXn9nzy5Amu0JEdMuNpSlqd7QNxLnbxHuZKC9ZPYnBUeJims8iyeFmsqeIlULU5LW+uYZ3sMy6ro2KJ1nC+DuStuqnlUFs1hColRzcT6ZQAvvxlTUVZ6ntHWnZ3sQzqk1K4VKVBmSVmA0oN6g2yhzUKbriFeUMOh8YSzXhbTVZMyzGdN/Ip0+biUj0L74jmA2JL2aVQEa8QUUp7rqvJnCAKoFgpaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8NXaLR5zCBgNln0NrN9mJqYNKS6scl2oQI0iomAb1u0=; b=AS4/ZmrHXjxF3nIb44/qQnzLX+Bq/Wxdv6e6nqzQtM5gInk9uYOaM/3i3PaUb2AVGyXEVmF85GRVjOaDq6SRDQsa0X4ZqDNamncPBGQk7mtuxiZ6KMnl4hR2AdLEla9LhsXxJ9USfbVHLgTw2FfdTheHBZ4sUaIFQxZOgDQzh6YLUtY7RXjB+WjXRybW06/wjAXfw22zSRWRLOgP9vZz89xGSTfykPJDNAckNzUTPF3sU5uNF+3j/IRdYGBMVmumQRBWAiibilzNdkKZooFDJB+j7Fg1JTdsFdUJgVsQTaQgcaks0Z9HoYlOx8yFuF6BjZwbyJtznwAnj1Ih0R0sOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:197::9) by OS3P286MB1781.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:162::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 14:13:54 +0000 Received: from OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM ([fe80::fd8b:c4b8:61a8:3d0]) by OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM ([fe80::fd8b:c4b8:61a8:3d0%8]) with mapi id 15.20.5373.017; Fri, 24 Jun 2022 14:13:54 +0000 From: Enze Li To: gdb-patches@sourceware.org Cc: aburgess@redhat.com, pedro@palves.net, enze.li@gmx.com Subject: [PATCH v2 1/2] gdb/testsuite: rename get_maint_bp_addr and move it to gdb-utils.exp Date: Fri, 24 Jun 2022 22:13:39 +0800 Message-ID: X-Mailer: git-send-email 2.36.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [VbMZzxxgcj9lTmGIbeX2CFOmf/sKo2TE] X-ClientProxiedBy: SG2P153CA0033.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::20) To OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:197::9) X-Microsoft-Original-Message-ID: <20220624141339.26297-1-enze.li@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a14202f-b0fa-4c6f-6cf7-08da55ebc56c X-MS-TrafficTypeDiagnostic: OS3P286MB1781:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yzrvJkeHIGJ9Trr3Oc0R4s95qIZmSqXGJdVqGhS+fynP9Yww37THYhbvoSwIfZRYMPwIKVPgQhvgcBj7NK90+0haUQKgDOEx2ms1/OD1/Fhw9fZV37a7XMqCtqqfR6WvvGBB0VUfZGwYOtEcmBuMuuyYqxJQ8T+VNM8aPQFzuaQHog6ZwgiENzmVRz4c7pYnWYhC5IaDoxG1AVaxWvn7TtZwhY05F2MBBUfZYf2Uhu3vvKbZpCPq14xNfAJ2K56+daJIJyeqaQXzazOu5ypQTeAhrMGB7/NSNYd2h1ec90pUm/I3V2tA+Qux+26vdQtTwu2uJsbE8vCSP4iP3Y56ekSETZkkDwtGD7VvlbRS8JbCsGarJTUt9aK5PHEVCc2MfqPTakwkU/Hics3JPu9XEiyCM1+DSQ1fKSCuXUH2aRrwhUH4iSZHfddn6lHT3jy+Y8nILktOeDU7g28Kb5VwMsVWwggJl3UqVK9jLSIFVIBPrSfNYkWotmFCJPoj20Hj7TM9gaWnEax+9D2OCfP68QXyRPIteL4RbpeXNEv4B+pjrpKeMLQcC2ZZZLvH+S74fYa3HBIbUfL5KclMGz/R2NwcXzC/aOMTbSvp0w3p3tlaLuVjcIQcBk+wKFc1rZuQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DjSkF+5oLroAoBjpxyUZMYqRMGqh7/pksCsjs4sBh+nME+mRQOtrRzbQ2mTZ?= =?us-ascii?Q?V7Wdl1ce1PijS1Net2DCVXc/GCNebvltEdLSHHeGK7g9gART4zGrVLB7O7c+?= =?us-ascii?Q?gxdgPYMxyfyPHXf7aWmDdgSqGKzUH7oRmN3kcAB+Kvj7E8vCwdZjb0YXkOP2?= =?us-ascii?Q?1aZXxzO8oYP4D3x/gtkbY0FK6xp8B7Gs+25x73ZeCCURUlvqKY8zc6c+8h0u?= =?us-ascii?Q?wAk34s/BsZY93BltK5BE/45qpL8qffgSd/OS+pOObmAIBU3Bn6viGQaWs35O?= =?us-ascii?Q?c7moeUHtzWFBSwP5yfvoLt5oufMzunYzE9xCFJEp1C53iHR0EFjTD7u9Scw7?= =?us-ascii?Q?Vmb00RgV7UDLrczV9Z53m+PAzDOHKx1k50nzeZomM/tmQQ1cf47YyjPCybAt?= =?us-ascii?Q?sFD90iHmD5ubho9BLK6f5jtjc0e/TK4CYbSMkFAjdP0qcPUuNX2SV5x9xMnn?= =?us-ascii?Q?AUHwmU47vlaPY2bF4GW+i4oldE89PPbZAzbHWmgJ+NjoWkNRWUG/NEpZgXm5?= =?us-ascii?Q?5yrxR8EPtkKEO7Gox8PHmx9hd5UHjMVUuo1LTa53yQfogSfuaLKa5KAQWILN?= =?us-ascii?Q?cq6Yt9xTrN8v5cc3+Ab6pmNKuTjQAK5SyU/WtorwOfLh13cocKgmh/8PNM+7?= =?us-ascii?Q?OElfXL3rm0t/xgztUO2rF75q4sVkxudkTNL4A4ZgCFGs8p8+koQOQcvoLOu5?= =?us-ascii?Q?x5B3xZMVBTJy1lA09DrdoqWOICGsBdR3qg9iNXwjl81Gl9UTjL/99/yVH7zT?= =?us-ascii?Q?xW9xzQuYN1VXKg0GjmCWUvdFup+RbwXavVGWqf3urY7M9lnFe31JbuluL7xQ?= =?us-ascii?Q?Yb4iubyelPo81DLmpl4NyGEWF7r9hfDoSA20vcvaHWELqc8FWmDJDb67i2Bb?= =?us-ascii?Q?fBs2ikwh/T9LoNTd89StfH+g5xedfeBMjyzKzmV7X4PWsXCakEDHwNgwq2H7?= =?us-ascii?Q?l3gP0ofaqXJT0ejAVcJuTzLAE3Hl0AMwpe31VJ6VBoCZu/xGxDIyZ8kVtTqi?= =?us-ascii?Q?XdX8VUf0DVPBw7mRIeQwMCxTfp4JwWpiDojCMq+kkQRnD9YYzdwxry4LkApc?= =?us-ascii?Q?wvUeZYGWKxaDif5B5b6goJGNeC71Dq9bPM7KEAjj95Z4sWfefueO2ChCjBkL?= =?us-ascii?Q?uLhHxYKBGmrJ9SnwCOZCpxOnL84C9sXD5v5ytsMfK9NLiY7idYAnA/ooHGhQ?= =?us-ascii?Q?6ry62Hxzw43T7wyA0mPOcgdtBuogTl+tcRGDCpcwEPO4DusKxlaxXWJ7qVwQ?= =?us-ascii?Q?28ol6ooyS4CEPtTeh9nbW+z1k9HU7O4VmF9a2k0hVA=3D=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 7a14202f-b0fa-4c6f-6cf7-08da55ebc56c X-MS-Exchange-CrossTenant-AuthSource: OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 14:13:54.7051 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3P286MB1781 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 14:14:01 -0000 The get_maint_bp_addr procedure will be shared by other test suite, so move it to gdb-utils.exp. Following Andrew's suggestion, I renamed get_maint_bp_addr to gdb_get_bp_addr, since it would have handled normal breakpoints in addition to the internal ones. Note that there is still room for improvement in this procedure, which I indicated in comments nearby. --- gdb/testsuite/gdb.base/clear_non_user_bp.exp | 25 +---------------- gdb/testsuite/lib/gdb-utils.exp | 28 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/gdb/testsuite/gdb.base/clear_non_user_bp.exp b/gdb/testsuite/gdb.base/clear_non_user_bp.exp index 26d7a31fa47..da694351c87 100644 --- a/gdb/testsuite/gdb.base/clear_non_user_bp.exp +++ b/gdb/testsuite/gdb.base/clear_non_user_bp.exp @@ -16,29 +16,6 @@ # Regression test for PR gdb/7161. Test that GDB cannot delete non-user # breakpoints with clear command. -# get_maint_bp_addr num -# -# Purpose: -# Get address of the specified internal breakpoint when using command -# "maint info breakpoints $num". -# -# Parameter: -# The parameter "num" indicates the number of the internal breakpoint -# to get. Note that this parameter must be a negative number. -# E.g., -1 means that we're gonna get the first internal breakpoint. -# -# Return: -# Internal breakpoint address. -# -proc get_maint_bp_addr { num } { - gdb_test_multiple "maint info break $num" "find address of internal bp $num" { - -re -wrap ".*(0x\[0-9a-f\]+).*" { - return $expect_out(1,string) - } - } - return "" -} - # get_first_maint_bp_num # # Purpose: @@ -77,7 +54,7 @@ if ![runto_main] then { } set bp_num [get_first_maint_bp_num] -set bp_addr [get_maint_bp_addr $bp_num] +set bp_addr [gdb_get_bp_addr $bp_num] gdb_test "maint info break $bp_num" \ "$bp_num.*$bp_addr.*" \ diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index ffdfb75557c..21953611ec2 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -72,3 +72,31 @@ proc style {str style} { } return "\033\\\[${style}m${str}\033\\\[m" } + +# gdb_get_bp_addr num +# +# Purpose: +# Get address of a particular breakpoint. +# +# Parameter: +# The parameter "num" indicates the number of the breakpoint to get. +# Note that *currently* this parameter must be an integer value. +# E.g., -1 means that we're gonna get the first internal breakpoint; +# 2 means to get the second user-defined breakpoint. +# +# Return: +# First address for a particular breakpoint. +# +# TODO: +# It would be nice if this procedure could accept floating point value. +# E.g., 'gdb_get_bp_addr 1.2' means to get the address of the second +# location of breakpoint #1. +# +proc gdb_get_bp_addr { num } { + gdb_test_multiple "maint info break $num" "find address of specified bp $num" { + -re -wrap ".*(0x\[0-9a-f\]+).*" { + return $expect_out(1,string) + } + } + return "" +} -- 2.36.1