From 8d8725bedd2f7cd5a894b47b43022f6ec0fef2c0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 20 Feb 2026 09:17:31 +0000 Subject: [PATCH] libstdc++: Fix testsuite breakage in r16-7593-g39edc2aea24f9a Fix my broken r16-7593-g39edc2aea24f9a commit which was an incomplete version of what I originally tested. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (v3-minimum-std): Remove second and third args in favour of using globals. --- libstdc++-v3/testsuite/lib/libstdc++.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index d2d61a9bed9c..4ffbf106b6bf 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -478,18 +478,18 @@ if { [info procs saved-dg-test] == [list] } { set v3_default_std 20 set v3_max_std 26 -# Find the minimum standard required by a test, if higher than the default_std. -proc v3-minimum-std { test default_std max_std } { +# Find the minimum standard required by a test, if higher than $v3_default_std. +proc v3-minimum-std { test } { global v3_default_std global v3_max_std - for {set s $default_std} {$s <= $v3_max_std} {incr s 3} { + for {set s $v3_default_std} {$s <= $v3_max_std} {incr s 3} { if [search_for $test "\{ dg-do * \{ target c++$s"] { return $s } elseif [search_for $test "\{ dg-require-effective-target c++$s"] { return $s } } - return $default_std + return $v3_default_std } # Allow v3_std_list to be set in configuration files, e.g., ~/.dejagnurc