From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 20FE0384F027; Tue, 17 Aug 2021 19:07:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20FE0384F027 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-8877] libstdc++: Avoid illegal argument to verbose in dg-test callback, continued X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 177dfb6167745039ec86cf860be3aa28930a4436 X-Git-Newrev: 112bbc8d1d81c1b6375ea3cfb083cdeb0a06ea3a Message-Id: <20210817190717.20FE0384F027@sourceware.org> Date: Tue, 17 Aug 2021 19:07:17 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2021 19:07:17 -0000 https://gcc.gnu.org/g:112bbc8d1d81c1b6375ea3cfb083cdeb0a06ea3a commit r11-8877-g112bbc8d1d81c1b6375ea3cfb083cdeb0a06ea3a Author: Thomas Schwinge Date: Tue Aug 17 17:58:30 2021 +0200 libstdc++: Avoid illegal argument to verbose in dg-test callback, continued This is a follow-up to commit 697b94cfaef4a958132faf0cf4b35b15dfb29acc "libstdc++: Avoid illegal argument to verbose in dg-test callback". I'm confirming the original problem, but on one system, it's not resolved by this change, because instead we get: extra_tool_flags are: ERROR: tcl error sourcing [...]/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp. ERROR: usage: send [args] string while executing "send_log "$message\n"" (procedure "verbose" line 48) invoked from within "verbose -log -- $extra_tool_flags" (procedure "libstdc++-dg-test" line 45) invoked from within "${tool}-dg-test $prog [lindex ${dg-do-what} 0] "$tool_flags ${dg-extra-tool-flags}"" (procedure "saved-dg-test" line 115) invoked from within [...] That's Ubuntu's dejagnu 1.5-3ubuntu1 being so old that it doesn't include DejaGnu commit 57c22601afe43d2c2b8819df4f2ecacb034516fd "Protect from leading dash in message". (I suppose that's what'd make this work, but have not verified.) libstdc++-v3/ * testsuite/lib/libstdc++.exp: Avoid illegal argument to verbose, continued. (cherry picked from commit 60b94d8bd2280837e980a53cf81bdf902d726e61) Diff: --- libstdc++-v3/testsuite/lib/libstdc++.exp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 7f9580db8ed..27fac23500c 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -410,8 +410,7 @@ proc libstdc++-dg-test { prog do_what extra_tool_flags } { set select_compile "v3_target_compile" set options "" if { $extra_tool_flags != "" } { - verbose -log "extra_tool_flags are:" - verbose -log -- $extra_tool_flags + verbose -log "extra_tool_flags are: $extra_tool_flags" if { [string first "-x c" $extra_tool_flags ] != -1 } { verbose -log "compiling and executing as C, not C++" set edit_tool_flags $extra_tool_flags