From patchwork Thu Oct 27 15:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 59527 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F2423388B687 for ; Thu, 27 Oct 2022 15:15:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2423388B687 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666883758; bh=FVNP8KWt/Q67RDORyd5zNvxLMUC17Hnrjo/4zmdLiu0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QsUv2Y+1/AYktGY7YLLsUDcJf9z7N4V7+YmgXBMjcSa2qrfzbrTUckF9tw1bXlOCO B3//rnx21s7kKatOelsJFjuyrL1nFMN/FQbsUVpHlrgkd533h1+XCWzfRRezftppcr crSU/ZeoS+dXvstSwjhYuhR+aMWp7U/mQBXDJ5fA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 012C73851150 for ; Thu, 27 Oct 2022 15:15:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 012C73851150 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0EFE11F8DC for ; Thu, 27 Oct 2022 15:15:05 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F151E134CA for ; Thu, 27 Oct 2022 15:15:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 3rroOXigWmPNKwAAMHmgww (envelope-from ) for ; Thu, 27 Oct 2022 15:15:04 +0000 To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Remove address from test names Date: Thu, 27 Oct 2022 17:15:04 +0200 Message-Id: <20221027151504.26737-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed an address in a test name: ... PASS: gdb.base/eh_return.exp: gdb_breakpoint: \ set breakpoint at *0x000000000040071b ... Stabilize the test name by using "set breakpoint on address" instead. Likewise in two other test-cases. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/eh_return.exp | 2 +- gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp | 2 +- gdb/testsuite/gdb.opt/inline-break.exp | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) base-commit: 1dc83674da675a20ae361a037305777d23764574 diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp index 6e4b9bd0bba..a6dda78e013 100644 --- a/gdb/testsuite/gdb.base/eh_return.exp +++ b/gdb/testsuite/gdb.base/eh_return.exp @@ -73,7 +73,7 @@ if { $address == -1 } { clean_restart ${binfile} -gdb_breakpoint "*$address" message +gdb_assert [gdb_breakpoint "*$address" no-message] "set breakpoint on address" # The assert did not reproduce when running to main, and continuing to the # breakpoint, so instead, run to the breakpoint. diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp index 17537585ad2..2e479d6ebe2 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp @@ -45,7 +45,7 @@ if { $next_insn_addr == "" } { return -1 } -gdb_test "b *$next_insn_addr" "Breakpoint .*" +gdb_test "b *$next_insn_addr" "Breakpoint .*" "set breakpoint on address" # So that GDB doesn't try to remove the regular breakpoint when the # step finishes. diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp index 24dd6ebaf0a..708fd74aa1e 100644 --- a/gdb/testsuite/gdb.opt/inline-break.exp +++ b/gdb/testsuite/gdb.opt/inline-break.exp @@ -292,7 +292,9 @@ with_test_prefix "address" { # Set the breakpoint by address, and check that GDB reports the # breakpoint location being the inline function. - gdb_test "break *$address" ".*Breakpoint .* at $address: file .*$srcfile, line $line." + gdb_test "break *$address" \ + ".*Breakpoint .* at $address: file .*$srcfile, line $line." \ + "set breakpoint on address" gdb_test "info break \$bpnum" "in func1 at .*$srcfile:$line"