* lib/dejagnu.exp: Trim off test state part of the message, so we

	don't duplicate it.

diff --git a/ChangeLog b/ChangeLog
index 6c62b6a..319f1d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-08  Rob Savoye  <rob@peggyo.welcomehome.org>
+
+       * lib/dejagnu.exp: Trim off test state part of the message, so we
+       don't duplicate it.
+
 2001-05-06  Rob Savoye  <rob@blackpeter.welcomehome.org>
 
        * debian/rules: Install all the doc formats.

diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index d550c5b..c85b54e 100755 (executable)
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -119,30 +119,35 @@ proc host_execute {args} {
        }
        -re "NOTE:${text}*" {
            regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
+           set output [string range $output 6 end]
            verbose "$output" 2
            set timetol 0
            exp_continue
        }
        -re "PASSED:${text}*" {
            regsub "\[\n\r\t\]*PASSED: $text\r\n" $expect_out(0,string) "" output
+           set output [string range $output 8 end]
            pass "$output"
            set timetol 0
            exp_continue
        }
        -re "FAILED:${text}*" {
            regsub "\[\n\r\t\]*FAILED: $text\r\n" $expect_out(0,string) "" output
+           set output [string range $output 8 end]
            fail "$output"
            set timetol 0
            exp_continue
        }
        -re "UNTESTED:${text}*" {
            regsub "\[\n\r\t\]*TESTED: $text\r\n" $expect_out(0,string) "" output
+           set output [string range $output 8 end]
            untested "$output"
            set timetol 0
            exp_continue
        }
        -re "UNRESOLVED:${text}*" {
            regsub "\[\n\r\t\]*UNRESOLVED: $text\r\n" $expect_out(0,string) "" output
+           set output [string range $output 8 end]
            unresolved "$output"
            set timetol 0
            exp_continue