* lib/framework.exp (clone_output): Protect from leading dash in
        $message.
        * runtest.exp (verbose): Likewise.
---
 lib/framework.exp |    8 ++++----
 runtest.exp       |    5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/framework.exp b/lib/framework.exp
index 8273882..32aaa74 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -311,18 +311,18 @@ proc clone_output { message } {
        "UNSUPPORTED:" -
        "UNTESTED:" {
            if {$all_flag} {
-               send_user "$message\n"
+               send_user -- "$message\n"
                return "$message"
            } else {
-               send_log "$message\n"
+               send_log -- "$message\n"
            }
        }
        {"ERROR:" "WARNING:" "NOTE:"} {
-           send_error "$message\n"
+           send_error -- "$message\n"
            return "$message"
        }
        default {
-           send_user "$message\n"
+           send_user -- "$message\n"
            return "$message"
        }
     }
diff --git a/runtest.exp b/runtest.exp
index a7ad7a0..78da782 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -185,7 +185,6 @@ proc verbose { args } {
     set message [lindex $args $i]
 
     if { $verbose >= $level } {
-       # There is no need for the "--" argument here, but play it safe.
        # We assume send_user also sends the text to the log file (which
        # appears to be the case though the docs aren't clear on this).
        if { $newline } {
@@ -195,9 +194,9 @@ proc verbose { args } {
        }
     } elseif { $logfile } {
        if { $newline } {
-           send_log "$message\n"
+           send_log -- "$message\n"
        } else {
-           send_log "$message"
+           send_log -- "$message"
        }
     }
 }
-- 
1.7.10.4


-- 
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

_______________________________________________
Bug-dejagnu mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/bug-dejagnu

Reply via email to