* lib/framework.exp (clone_output): Protect from leading dash in

	$message.
	* runtest.exp (verbose): Likewise.

Signed-off-by: Ben Elliston <bje@gnu.org>

3 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 95362e6..97213ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* lib/framework.exp (clone_output): Protect from leading dash in
+	$message.
+	* runtest.exp (verbose): Likewise.
+
 2012-06-11  Tom Tromey  <tromey@redhat.com>
 
 	* doc/runtest.1: Update.
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"
 	}
     }
 }