aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2021-08-17 17:58:30 +0200
committerThomas Schwinge <thomas@codesourcery.com>2021-08-17 21:05:27 +0200
commit60b94d8bd2280837e980a53cf81bdf902d726e61 (patch)
treea19179bef565bf4b38d7d9fa3079e03fb6e7e234
parentb240450b630da511fadda98bba4862033ff56950 (diff)
downloadgcc-60b94d8bd2280837e980a53cf81bdf902d726e61.zip
gcc-60b94d8bd2280837e980a53cf81bdf902d726e61.tar.gz
gcc-60b94d8bd2280837e980a53cf81bdf902d726e61.tar.bz2
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.
-rw-r--r--libstdc++-v3/testsuite/lib/libstdc++.exp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 73b202c..35ccbe4 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