From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EVmQMyz8eWnKvxkAWB0awg (envelope-from ) for ; Wed, 28 Jan 2026 07:08:12 -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=Nmjo36ep; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ReIpz5A8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Nmjo36ep; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ReIpz5A8; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CDD1C1E0DD; Wed, 28 Jan 2026 07:08:12 -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 286E21E08D for ; Wed, 28 Jan 2026 07:08:12 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id AA0944BAD148 for ; Wed, 28 Jan 2026 12:08:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AA0944BAD148 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=Nmjo36ep; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ReIpz5A8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Nmjo36ep; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ReIpz5A8 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 7146A4BAD16B for ; Wed, 28 Jan 2026 12:06:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7146A4BAD16B 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 7146A4BAD16B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769602010; cv=none; b=ceAw9SU09HiS2SUiE8kO7G87ZPAQdnoIUsqC94DOEGmsPxIbyGC0E978H1IwB7wLYLPoa+lAC3xRJJhTNzlQtpP3juiiHG0WGtpVJ42xWWP9eCh/D9O+n/ldRn1N3+f+4bjmMap5slNloWYLE5KxoNuLJNy/CaDanIaDcR63MBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769602010; c=relaxed/simple; bh=Phr52adAIBezSTmQtaQR5cZt2NwJUSzJW8dGq6O91GE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=IT0GV8rwglFy+J23rCl3miLCMZSAOxwLAr7x21af/eIYXqXrPzhEznAWDtHYhay8TQjma/uUm8kGaf2Qej2yTSVUMfvZpaFIRjZQgSSyHUDGT1wgX3JNhFPKkXxm4osPteityND81WWLQOB4bgIgpCHBqmJgZEucyEIdoDdj7Mw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7146A4BAD16B 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-out2.suse.de (Postfix) with ESMTPS id D55965BCDF 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=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=ETFORYxDUmzPAHmvUVGNe3Cr0cTjz6IpoAtye+lRJi0=; b=Nmjo36ep16EvbMwBKY7eAC4z53cfliad1S5+p+Pp0tm7kFj9ODNclPIW1GuOZdZCWcppic dnBJd1vHAa9cy5ZYFbaFROn+9+unYpVtD2x2apc5/sp5V/hRkEqH3oWhjIbmvc1R9Dw4eM 3l+LYas5gbl3VjNd9vobXoMVjPtFpyo= 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=ETFORYxDUmzPAHmvUVGNe3Cr0cTjz6IpoAtye+lRJi0=; b=ReIpz5A8B2xnmDv8hrhgEBXLcz/YX9D62rtaBVeNpn8jkRHkecgodCAhIUnshFovH2Sdd8 uKIi4gAQlCEn1TBw== Authentication-Results: smtp-out2.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=ETFORYxDUmzPAHmvUVGNe3Cr0cTjz6IpoAtye+lRJi0=; b=Nmjo36ep16EvbMwBKY7eAC4z53cfliad1S5+p+Pp0tm7kFj9ODNclPIW1GuOZdZCWcppic dnBJd1vHAa9cy5ZYFbaFROn+9+unYpVtD2x2apc5/sp5V/hRkEqH3oWhjIbmvc1R9Dw4eM 3l+LYas5gbl3VjNd9vobXoMVjPtFpyo= 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=ETFORYxDUmzPAHmvUVGNe3Cr0cTjz6IpoAtye+lRJi0=; b=ReIpz5A8B2xnmDv8hrhgEBXLcz/YX9D62rtaBVeNpn8jkRHkecgodCAhIUnshFovH2Sdd8 uKIi4gAQlCEn1TBw== 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 B6C5C3EA61 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 IDhPK8j7eWmZbwAAD6G6ig (envelope-from ) for ; Wed, 28 Jan 2026 12:06:32 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 4/5] [gdb/testsuite] Use valnum_re more often (part 3) Date: Wed, 28 Jan 2026 13:06:25 +0100 Message-ID: <20260128120626.1032047-5-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 Also transform '\\\$\[0-9\].*' into valnum_re, assuming that '\\\$\[0-9\]+' was meant. Done using these commands to cover '\\\$' vs '\\$' and '\[0-9\]' vs '\[0-9]': ... find gdb/testsuite/ -type f -name *.exp* \ | xargs sed -i 's/\\\\\\$\\\[0-9\\\]\.\*/${::valnum_re}/g' find gdb/testsuite/ -type f -name *.exp* \ | xargs sed -i 's/\\\\\\$\\\[0-9\]\.\*/${::valnum_re}/g' find gdb/testsuite/ -type f -name *.exp* \ | xargs sed -i 's/\\\\$\\\[0-9\\\]\.\*/${::valnum_re}/g' find gdb/testsuite/ -type f -name *.exp* \ | xargs sed -i 's/\\\\$\\\[0-9\]\.\*/${::valnum_re}/g' ... --- gdb/testsuite/gdb.cp/m-static.exp | 20 +++++++-------- gdb/testsuite/gdb.cp/namespace.exp | 40 +++++++++++++++--------------- gdb/testsuite/gdb.cp/nsimport.exp | 6 ++--- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index 05516d918ac..939e1880d64 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -139,33 +139,33 @@ gdb_test "print test2.key1" "${::valnum_re} = 5" "derived template object, base gdb_test "print test2.key2" "${::valnum_re} = 77" "derived template object, base static long" # derived template object, base static enum -gdb_test "print test2.value" "\\$\[0-9\].* = oriental" "derived template object, base static enum" +gdb_test "print test2.value" "${::valnum_re} = oriental" "derived template object, base static enum" # derived template object, static enum -gdb_test "print test2.value_derived" "\\$\[0-9\].* = etruscan" "derived template object, static enum" +gdb_test "print test2.value_derived" "${::valnum_re} = etruscan" "derived template object, static enum" # Three. # template object, static derived template data member's base static const bool -gdb_test "print test3.data.test" "\\$\[0-9\].* = true" "template object, static const bool" +gdb_test "print test3.data.test" "${::valnum_re} = true" "template object, static const bool" # template object, static derived template data member's base static const int -gdb_test "print test3.data.key1" "\\$\[0-9\].* = 5" "template object, static const int" +gdb_test "print test3.data.key1" "${::valnum_re} = 5" "template object, static const int" # template object, static derived template data member's base static long -gdb_test "print test3.data.key2" "\\$\[0-9\].* = 77" "template object, static long" +gdb_test "print test3.data.key2" "${::valnum_re} = 77" "template object, static long" # template object, static derived template data member's base static enum -gdb_test "print test3.data.value" "\\$\[0-9\].* = oriental" "template object, static enum" +gdb_test "print test3.data.value" "${::valnum_re} = oriental" "template object, static enum" # template object, static derived template data member's static enum -gdb_test "print test3.data.value_derived" "\\$\[0-9\].* = etruscan" "template object, static derived enum" +gdb_test "print test3.data.value_derived" "${::valnum_re} = etruscan" "template object, static derived enum" # 2002-08-16 # Four. # static const int initialized in another file. -gdb_test "print test4.elsewhere" "\\$\[0-9\].* = 221" "static const int initialized elsewhere" +gdb_test "print test4.elsewhere" "${::valnum_re} = 221" "static const int initialized elsewhere" # static const int that nobody initializes. From PR gdb/635. if {[test_compiler_info {gcc-[0-3]-*}] @@ -184,9 +184,9 @@ gdb_test "print test4" "static nowhere = .*" "static const int in # static const initialized in the class definition, PR gdb/11702. if { $non_dwarf } { setup_xfail *-*-* } -gdb_test "print test4.everywhere" "\\$\[0-9\].* = 317" "static const int initialized in class definition" +gdb_test "print test4.everywhere" "${::valnum_re} = 317" "static const int initialized in class definition" if { $non_dwarf } { setup_xfail *-*-* } -gdb_test "print test4.somewhere" "\\$\[0-9\].* = 3.14\[0-9\]*" "static const float initialized in class definition" +gdb_test "print test4.somewhere" "${::valnum_re} = 3.14\[0-9\]*" "static const float initialized in class definition" # Also make sure static const members can be found via "info var". if { $non_dwarf } { setup_xfail *-*-* } diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index 50fa4c843b1..6c5dd667060 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -150,8 +150,8 @@ gdb_test "whatis C::cOtherFileType" "type = short" gdb_test "whatis ::C::cOtherFileType" "type = short" gdb_test "whatis C::cOtherFileVar" "type = const C::cOtherFileType" gdb_test "whatis ::C::cOtherFileVar" "type = const C::cOtherFileType" -gdb_test "print C::cOtherFileVar" "\\$\[0-9\].* = 319" -gdb_test "print ::C::cOtherFileVar" "\\$\[0-9\].* = 319" +gdb_test "print C::cOtherFileVar" "${::valnum_re} = 319" +gdb_test "print ::C::cOtherFileVar" "${::valnum_re} = 319" if {$xfail_class_types} { setup_xfail *-*-* } gdb_test "whatis C::OtherFileClass::cOtherFileClassType" "type = short" @@ -169,7 +169,7 @@ gdb_test_multiple $test $test { gdb_test $test2 " = 318" } - -re "\\$\[0-9\].* = 318\r\n$gdb_prompt $" { + -re "${::valnum_re} = 318\r\n$gdb_prompt $" { # Do not permit to XFAIL on recent GCCs. if {$xfail_class_types} { setup_xfail *-*-* @@ -194,15 +194,15 @@ if {![runto "C::D::marker2"]} { return } -gdb_test "print c" "\\$\[0-9\].* = 1" +gdb_test "print c" "${::valnum_re} = 1" gdb_test "print cc" "No symbol \"cc\" in current context." -gdb_test "print 'C::cc'" "\\$\[0-9\].* = 2" -gdb_test "print C::cc" "\\$\[0-9\].* = 2" -gdb_test "print cd" "\\$\[0-9\].* = 3" +gdb_test "print 'C::cc'" "${::valnum_re} = 2" +gdb_test "print C::cc" "${::valnum_re} = 2" +gdb_test "print cd" "${::valnum_re} = 3" gdb_test "print C::D::cd" "No type \"D\" within class or namespace \"C::C\"." -gdb_test "print 'E::cde'" "\\$\[0-9\].* = 5" -gdb_test "print E::cde" "\\$\[0-9\].* = 5" -gdb_test "print shadow" "\\$\[0-9\].* = 13" +gdb_test "print 'E::cde'" "${::valnum_re} = 5" +gdb_test "print E::cde" "${::valnum_re} = 5" +gdb_test "print shadow" "${::valnum_re} = 13" gdb_test "print E::ce" "No symbol \"ce\" in namespace \"C::D::E\"." gdb_test "ptype C" "type = namespace C::C" gdb_test "ptype E" "type = namespace C::D::E" @@ -219,7 +219,7 @@ gdb_test "ptype C::NestedClass" "No symbol \"NestedClass\" in namespace \"C::C\" # Tests involving multiple files -gdb_test "print cOtherFile" "\\$\[0-9\].* = 316" +gdb_test "print cOtherFile" "${::valnum_re} = 316" gdb_test "ptype OtherFileClass" "type = (class C::OtherFileClass \{\r\n public:|struct C::OtherFileClass \{)\r\n int z;\r\n.*\}" gdb_test "ptype ::C::OtherFileClass" "type = class C::OtherFileClass \{\r\n public:\r\n int z;\r\n.*\}" gdb_test "ptype C::OtherFileClass" "No symbol \"OtherFileClass\" in namespace \"C::C\"." @@ -233,19 +233,19 @@ gdb_test "ptype ::C::OtherFileClass" $expect "ptype ::C::OtherFileClass typedefs # Some anonymous namespace tests. -gdb_test "print cX" "\\$\[0-9\].* = 6" -gdb_test "print 'F::cXf'" "\\$\[0-9\].* = 7" -gdb_test "print F::cXf" "\\$\[0-9\].* = 7" -gdb_test "print F::cXfX" "\\$\[0-9\].* = 8" -gdb_test "print X" "\\$\[0-9\].* = 9" -gdb_test "print 'G::Xg'" "\\$\[0-9\].* = 10" -gdb_test "print G::Xg" "\\$\[0-9\].* = 10" -gdb_test "print G::XgX" "\\$\[0-9\].* = 11" +gdb_test "print cX" "${::valnum_re} = 6" +gdb_test "print 'F::cXf'" "${::valnum_re} = 7" +gdb_test "print F::cXf" "${::valnum_re} = 7" +gdb_test "print F::cXfX" "${::valnum_re} = 8" +gdb_test "print X" "${::valnum_re} = 9" +gdb_test "print 'G::Xg'" "${::valnum_re} = 10" +gdb_test "print G::Xg" "${::valnum_re} = 10" +gdb_test "print G::XgX" "${::valnum_re} = 11" gdb_test "print cXOtherFile" "No symbol \"cXOtherFile\" in current context." gdb_test "print XOtherFile" "No symbol \"XOtherFile\" in current context." # Enum tests. -gdb_test "print AAA::ALPHA" "\\$\[0-9\].* = AAA::ALPHA" +gdb_test "print AAA::ALPHA" "${::valnum_re} = AAA::ALPHA" # Regression tests for PR 9496. gdb_test "whatis ::C::CClass::NestedClass" "type = C::CClass::NestedClass" diff --git a/gdb/testsuite/gdb.cp/nsimport.exp b/gdb/testsuite/gdb.cp/nsimport.exp index cc713bd0b78..bab4701f16f 100644 --- a/gdb/testsuite/gdb.cp/nsimport.exp +++ b/gdb/testsuite/gdb.cp/nsimport.exp @@ -31,6 +31,6 @@ if {![runto_main]} { return } -gdb_test "print x" "\\$\[0-9\].* = 11" -gdb_test "print xx" "\\$\[0-9\].* = 22" -gdb_test "print xxx" "\\$\[0-9\].* = 33" +gdb_test "print x" "${::valnum_re} = 11" +gdb_test "print xx" "${::valnum_re} = 22" +gdb_test "print xxx" "${::valnum_re} = 33" -- 2.51.0