From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OfLGBK/8eWnKvxkAWB0awg (envelope-from ) for ; Wed, 28 Jan 2026 07:10:23 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=FDLQwmLr; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=pAjLcuXp; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=xyEI40UY; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1vFRIjwM; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 0D8311E0DD; Wed, 28 Jan 2026 07:10:23 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 7548C1E08D for ; Wed, 28 Jan 2026 07:10:22 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 123A94BA900E for ; Wed, 28 Jan 2026 12:10:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 123A94BA900E Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=FDLQwmLr; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=pAjLcuXp; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=xyEI40UY; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1vFRIjwM Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id E39794BAD15A for ; Wed, 28 Jan 2026 12:06:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E39794BAD15A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E39794BAD15A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769602010; cv=none; b=yDR2sPn0a2hiCslUqTtdzsmtt1T/KlCo1Mle9IZTsAWaXrJYPd+37NoXINeDrIDHZhY95KrhPuSKMVYQ4ONQ75cSkQ8JRDHkrryid3NApXGYvduBZvVSrAE1dvO9h9NyGmSa5YM28GRmMeQl8G/hfV+xLj4yIfaIaMtki51ELac= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769602010; c=relaxed/simple; bh=O6SJW9n9RX/TWz1LbPb7jXRSZYSv1cMfCn7Iq8yL09U=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=VeuFhGMLYLVd5pMeA9RjP0hFy8ZCTMov74U5jdEWpr3iVEIHm84JgA7XiXWLbceiMHRQBlyjG28oHqA186wWAVQnF1jj4tIsJgrJWooveiMvhAyQOk6bYlMb+uGYT6owWUz5kQYE7AG6MJK4zKCXMN5LLy66scJY8xpDnhsINWs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E39794BAD15A Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EEFFC33B7E for ; Wed, 28 Jan 2026 12:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769601993; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uXUDg8nfmJbduHvmVuHqqZpfbmRr3s2a8svy4hvl9s0=; b=FDLQwmLrr22xSYbr229e7LutQ3VCABIgFjqC+465qLW/30cse9dBlOAmLpJx1vtNls7OfT Vfw7yTBBKtmf1Vmr7NK+Ju+dw/mi4xPluWWV+krmDJa0RfC9s43NyoF2kQ2HxqXB9RPs6L qyrlF5AF43n+rMY2R3+y3zH8a0Lobeo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769601993; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uXUDg8nfmJbduHvmVuHqqZpfbmRr3s2a8svy4hvl9s0=; b=pAjLcuXpLIkcCrh5gsNCLqFFMNE+5nAr5X6RMTpUrvUl2+kOSDtatuDFPly8ANapf+1884 hvVWJ7huqW+ySLDw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769601992; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uXUDg8nfmJbduHvmVuHqqZpfbmRr3s2a8svy4hvl9s0=; b=xyEI40UYyHAH+hzt4Sb1zcIQJZCMib4K8m/3fTTtMVzz/1ZRu9a8cnp5h8rGoV8AZcMzq5 O7DA3Useh7EuDuThgVVmu+7YlAisXmMkX4Ev8p9HyiOxp9ry6WruVXj4XLIw4Wur03NokW MWmugon2q1kHCrNTh6lgjFbKWkqxsEE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769601992; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uXUDg8nfmJbduHvmVuHqqZpfbmRr3s2a8svy4hvl9s0=; b=1vFRIjwMlVd/X63UVzmAnn9JlXJP9luMfcYN6YkXkymEy+bFRxzs6MR2lmhfs7ekfpH942 6XhXLwht/uVRO7Ag== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D044B3EA62 for ; Wed, 28 Jan 2026 12:06:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UFSiMcj7eWmZbwAAD6G6ig (envelope-from ) for ; Wed, 28 Jan 2026 12:06:32 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 5/5] [gdb/testsuite] Use valnum_re more often (part 4) Date: Wed, 28 Jan 2026 13:06:26 +0100 Message-ID: <20260128120626.1032047-6-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260128120626.1032047-1-tdevries@suse.de> References: <20260128120626.1032047-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Grepping through the testsuite I also found: - "\\$\[0-9\]\+" - "\\$\[0-9\]\*" - "\\$\[0-9\]". Also replace these with valnum_re. --- gdb/testsuite/gdb.base/bitfields.exp | 12 ++++++------ gdb/testsuite/gdb.cp/m-data.exp | 6 +++--- gdb/testsuite/gdb.objc/basicclass.exp | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp index a5928ab2daf..6f4ace22371 100644 --- a/gdb/testsuite/gdb.base/bitfields.exp +++ b/gdb/testsuite/gdb.base/bitfields.exp @@ -193,12 +193,12 @@ proc bitfield_internalvar {} { gdb_test_no_output "set \$myvar.f = 1" # Here comes the true testing. - gdb_test "print \$myvar.a" "\\$\[0-9\]\+ = 0" - gdb_test "print \$myvar.inner.b" "\\$\[0-9\]\+ = 1" - gdb_test "print \$myvar.inner.deep.c" "\\$\[0-9\]\+ = 0" - gdb_test "print \$myvar.inner.deep.d" "\\$\[0-9\]\+ = -1" - gdb_test "print \$myvar.inner.e" "\\$\[0-9\]\+ = -1" - gdb_test "print \$myvar.f" "\\$\[0-9\]\+ = -1" + gdb_test "print \$myvar.a" "${::valnum_re} = 0" + gdb_test "print \$myvar.inner.b" "${::valnum_re} = 1" + gdb_test "print \$myvar.inner.deep.c" "${::valnum_re} = 0" + gdb_test "print \$myvar.inner.deep.d" "${::valnum_re} = -1" + gdb_test "print \$myvar.inner.e" "${::valnum_re} = -1" + gdb_test "print \$myvar.f" "${::valnum_re} = -1" } gdb_test_no_output "set print sevenbit-strings" diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp index 7b67d78d55b..1d1c94e107d 100644 --- a/gdb/testsuite/gdb.cp/m-data.exp +++ b/gdb/testsuite/gdb.cp/m-data.exp @@ -85,14 +85,14 @@ gdb_test "print test3.data.key2" "${::valnum_re} = 7" "template object, long" gdb_test "print test3.data.value" "${::valnum_re} = oriental" "template object, base enum" # template object, derived template data member's enum -gdb_test "print test3.data.value_derived" "\\$\[0-9]\* = etruscan" "template object, derived enum" +gdb_test "print test3.data.value_derived" "${::valnum_re} = etruscan" "template object, derived enum" # Now some tests for shadowing (see PR gdb/804): gdb_breakpoint "C::marker" gdb_continue_to_breakpoint "continue to shadow breakpoint" -gdb_test "print shadow" "\\$\[0-9]\* = 1" "shadowing member" -gdb_test "print ::shadow" "\\$\[0-9]\* = 0" "shadowed global variable" +gdb_test "print shadow" "${::valnum_re} = 1" "shadowing member" +gdb_test "print ::shadow" "${::valnum_re} = 0" "shadowed global variable" gdb_exit diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp index 79ac09dbb4d..903583274e4 100644 --- a/gdb/testsuite/gdb.objc/basicclass.exp +++ b/gdb/testsuite/gdb.objc/basicclass.exp @@ -124,15 +124,15 @@ gdb_test continue \ # Test printing objects # gdb_test "print object" \ - "\\$\[0-9\] = .*0x0" \ + "${::valnum_re} = .*0x0" \ " print an ivar of self" gdb_test "print self" \ - "\\$\[0-9\] = \\(.*BasicClass \\*\\) 0x\[0-9a-f\]+" \ + "${::valnum_re} = \\(.*BasicClass \\*\\) 0x\[0-9a-f\]+" \ " print self" gdb_test "print \*self" \ - "\\$\[0-9\] = \{{?isa = 0x\[0-9a-f\]+( <.*>)?}?, object = 0x0\}" \ + "${::valnum_re} = \{{?isa = 0x\[0-9a-f\]+( <.*>)?}?, object = 0x0\}" \ " print contents of self" # @@ -154,11 +154,11 @@ gdb_test continue \ # Test calling Objective-C methods # gdb_test "print \[self printHi\]" \ - "Hi.*\\$\[0-9\] = \\(.*objc_object \\*\\) 0x\[0-9a-f\]+" \ + "Hi.*${::valnum_re} = \\(.*objc_object \\*\\) 0x\[0-9a-f\]+" \ "call an Objective-C method with no arguments" gdb_test "print \[self printNumber: 42\]" \ - "42.*\\$\[0-9\] = 43" \ + "42.*${::valnum_re} = 43" \ "call an Objective-C method with one argument" # -- 2.51.0