[gcc(refs/users/guojiufu/heads/personal-branch)] libstdc++: Avoid illegal argument to verbose in dg-test callback

Jiu Fu Guo guojiufu@gcc.gnu.org
Mon Apr 27 09:33:44 GMT 2020


https://gcc.gnu.org/g:697b94cfaef4a958132faf0cf4b35b15dfb29acc

commit 697b94cfaef4a958132faf0cf4b35b15dfb29acc
Author: Matthias Kretz <kretz@kde.org>
Date:   Mon Apr 20 15:29:41 2020 +0100

    libstdc++: Avoid illegal argument to verbose in dg-test callback
    
    If extra_tool_flags starts with a dash, an error like 'ERROR: verbose:
    illegal argument: -march=native -O2 -std=c++17' is printed. This is
    easily fixed by inserting a double dash before the variable.
    
    2020-04-20  Matthias Kretz  <kretz@kde.org>
    
            * testsuite/lib/libstdc++.exp: Avoid illegal argument to verbose.

Diff:
---
 libstdc++-v3/ChangeLog                   | 4 ++++
 libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fde5ac1bf37..b30b1d096e8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-20  Matthias Kretz  <kretz@kde.org>
+
+	* testsuite/lib/libstdc++.exp: Avoid illegal argument to verbose.
+
 2020-04-19  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/stl_queue.h (queue): Define operator<=> for C++20.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 10a7e748464..7f4532c55b2 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -408,7 +408,7 @@ proc libstdc++-dg-test { prog do_what extra_tool_flags } {
     set options ""
     if { $extra_tool_flags != "" } {
 	verbose -log "extra_tool_flags are:"
-	verbose -log $extra_tool_flags
+	verbose -log -- $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


More information about the Libstdc++-cvs mailing list