[binutils-gdb] [gdb/testsuite] Use valnum_re more often (part 5)

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=625b835f63153677bf614de266c7bc8963163ffc

commit 625b835f63153677bf614de266c7bc8963163ffc
Author: Tom de Vries <tdevries@suse.de>
Date:   Tue Feb 17 20:02:50 2026 +0100

    [gdb/testsuite] Use valnum_re more often (part 5)
    
    Use valnum_re instead of "\\\$\\d+" and "\\$\\d+".  In one case though I used
    quotemeta.
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/gdb.base/watch-bitfields.exp  | 4 ++--
 gdb/testsuite/gdb.dwarf2/shortpiece.exp     | 7 ++++---
 gdb/testsuite/gdb.fortran/call-no-debug.exp | 2 +-
 gdb/testsuite/gdb.tui/scroll.exp            | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/gdb.base/watch-bitfields.exp b/gdb/testsuite/gdb.base/watch-bitfields.exp
index 30a52609367..83f33de12e4 100644
--- a/gdb/testsuite/gdb.base/watch-bitfields.exp
+++ b/gdb/testsuite/gdb.base/watch-bitfields.exp
@@ -44,9 +44,9 @@ proc watch { expr } {
 proc expect_watchpoint { expr old new } {
     with_test_prefix "$expr: $old->$new" {
 	set expr_re [string_to_regexp $expr]
-	gdb_test "print $expr" "\\$\\d+ = $old" "print expression before"
+	gdb_test "print $expr" "$::valnum_re = $old" "print expression before"
 	gdb_test "continue" "$expr_re\\s.*Old value = $old\\s+New value = $new\\s.*"
-	gdb_test "print $expr" "\\$\\d+ = $new" "print expression after"
+	gdb_test "print $expr" "$::valnum_re = $new" "print expression after"
     }
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/shortpiece.exp b/gdb/testsuite/gdb.dwarf2/shortpiece.exp
index b1cea14fd43..118f7f1a97c 100644
--- a/gdb/testsuite/gdb.dwarf2/shortpiece.exp
+++ b/gdb/testsuite/gdb.dwarf2/shortpiece.exp
@@ -145,6 +145,7 @@ gdb_test {p (short []) s1} " = ($re_little|$re_big)"
 # Test for correct output if the size of the original object is not a
 # multiple of the array's element size.
 gdb_test "p s3" " = {a = 0, b = 1}"
-gdb_test "p (int \[\]) s3" [multi_line \
-				"warning: array element type size does not divide object size in cast" \
-				"\\$\\d = \\{0\\}"]
+gdb_test {p (int []) s3} \
+    [multi_line \
+	 "warning: array element type size does not divide object size in cast" \
+	 [quotemeta "$@DECIMAL = {0}"]]
diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gdb.fortran/call-no-debug.exp
index e1d901a554b..e3161635536 100644
--- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
+++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
@@ -104,5 +104,5 @@ if { $symbol_name == "" } {
 	"'${symbol_name}' has unknown return type; cast the call to its declared return type"
     gdb_test_stdio "call (integer) ${symbol_name} (&'abcdefg', 3)" \
 	" abc" \
-	"\\\$\\d+ = 0"
+	"$valnum_re = 0"
 }
diff --git a/gdb/testsuite/gdb.tui/scroll.exp b/gdb/testsuite/gdb.tui/scroll.exp
index cb8c68162a8..e9fa829f40e 100644
--- a/gdb/testsuite/gdb.tui/scroll.exp
+++ b/gdb/testsuite/gdb.tui/scroll.exp
@@ -65,7 +65,7 @@ for {set i 10} {$i < 20} {incr i 1} {
     Term::wait_for_region_contents 0 0 80 8 \
 	[multi_line \
 	     "$gdb_prompt [string_to_regexp $cmd]\\s+" \
-	     "\\\$\\d+ = $i\\s+" \
+	     [subst_vars {$valnum_re = $i\s+}] \
 	     "$gdb_prompt "]
 }