* lib/dejagnu.exp: Add $text\r\n to all strings, to make sure we

	only get one line at a time.

diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index f98effbc2d410488770be055ac9be110850c39ba..d550c5b59fd008caf1cc440d33e5cc0de9774a5e 100755 (executable)
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -112,37 +112,37 @@ proc host_execute {args} {
     spawn -noecho "./${executable}" ${params}
     expect {
        -re "\[0-9\]\[0-9\]:..:..:${text}\r\n" {
-           regsub "\[\n\r\t\]*NOTE: " $expect_out(0,string) "" output
+           regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
            verbose "$output" 3
            set timetol 0
            exp_continue
        }
        -re "NOTE:${text}*" {
-           regsub "\[\n\r\t\]*NOTE: " $expect_out(0,string) "" output
+           regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
            verbose "$output" 2
            set timetol 0
            exp_continue
        }
        -re "PASSED:${text}*" {
-           regsub "\[\n\r\t\]*PASSED: " $expect_out(0,string) "" output
+           regsub "\[\n\r\t\]*PASSED: $text\r\n" $expect_out(0,string) "" output
            pass "$output"
            set timetol 0
            exp_continue
        }
        -re "FAILED:${text}*" {
-           regsub "\[\n\r\t\]*FAILED: " $expect_out(0,string) "" output
+           regsub "\[\n\r\t\]*FAILED: $text\r\n" $expect_out(0,string) "" output
            fail "$output"
            set timetol 0
            exp_continue
        }
        -re "UNTESTED:${text}*" {
-           regsub "\[\n\r\t\]*TESTED: " $expect_out(0,string) "" output
+           regsub "\[\n\r\t\]*TESTED: $text\r\n" $expect_out(0,string) "" output
            untested "$output"
            set timetol 0
            exp_continue
        }
        -re "UNRESOLVED:${text}*" {
-           regsub "\[\n\r\t\]*UNRESOLVED: " $expect_out(0,string) "" output
+           regsub "\[\n\r\t\]*UNRESOLVED: $text\r\n" $expect_out(0,string) "" output
            unresolved "$output"
            set timetol 0
            exp_continue