From patchwork Wed Jan 25 15:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 63679 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 36F9D3858C83 for ; Wed, 25 Jan 2023 15:36:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36F9D3858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674660992; bh=uT/zYHaaSb7+ffeuvIwwgYA+jdwzGCHEwboeN788SCU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pzZaE8buVWuDpbUzv/aKXvkgwT2VBny93tl0l7sN8u6pO91ks+bxTiA6z8qfwK4+K Blo7614c6vMa7av5jMrGxfLyACYFxjtFn3clSxx7ExHLfkG7Noq0i6WNw2qmLrCeH0 R5zFfVpqjlOgWMtI14AebD+zEiA8e5SMAmEy1xNw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id E09713858D33 for ; Wed, 25 Jan 2023 15:36:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E09713858D33 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-out1.suse.de (Postfix) with ESMTPS id 1C03E219C8 for ; Wed, 25 Jan 2023 15:36:07 +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 0B04C1339E for ; Wed, 25 Jan 2023 15:36:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id GKyXAWdM0WO3cgAAMHmgww (envelope-from ) for ; Wed, 25 Jan 2023 15:36:07 +0000 To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Fix gdb.base/unwind-on-each-insn.exp for -m32 Date: Wed, 25 Jan 2023 16:36:06 +0100 Message-Id: <20230125153606.18043-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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" With test-case gdb.base/unwind-on-each-insn.exp and target board unix/-m32, I now get: ... # of expected passes 25 ... instead of: ... # of expected passes 133 ... as I used to get before commit d25a8dbc7c3 ("[gdb/testsuite] Allow debug srcfile2 in gdb.base/unwind-on-each-insn.exp"), due to the test-case trying to match "rip = " and info frame printing "eip = " instead. Fix this by dropping "rip" from the regexp. Tested on x86_64-linux, target boards unix/{-m64,-m32}. --- gdb/testsuite/gdb.base/unwind-on-each-insn.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: d25a8dbc7c3ae12aea8a203ce64f78608e22daa0 diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp index 059967a2b2e..0d0683659c3 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp @@ -146,7 +146,7 @@ proc do_test { function step_cmd } { set in_fn 0 gdb_test_multiple "info frame" "" { - -re -wrap "rip = $::hex in ${function}( \\(.*\\))?;.*" { + -re -wrap " = $::hex in ${function}( \\(.*\\))?;.*" { set in_fn 1 } -re -wrap "" {}