diff options
| author | bemis <bemis> | 2002-11-13 18:16:53 +0000 |
|---|---|---|
| committer | bemis <bemis> | 2002-11-13 18:16:53 +0000 |
| commit | a1d8a95c36c751651550f749c9dedc9a1081bfe7 (patch) | |
| tree | ea1cfeb1293a48d1c3b11305601eb9dde523415b /lib | |
| parent | 397024bfa0099cfec38434cd6aa1774b312cb8ac (diff) | |
| download | dejagnu-a1d8a95c36c751651550f749c9dedc9a1081bfe7.zip dejagnu-a1d8a95c36c751651550f749c9dedc9a1081bfe7.tar.gz dejagnu-a1d8a95c36c751651550f749c9dedc9a1081bfe7.tar.bz2 | |
modified input/output, and checked for empty variables
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/framework.exp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/framework.exp b/lib/framework.exp index e6c9989..5b245c2 100644 --- a/lib/framework.exp +++ b/lib/framework.exp @@ -48,12 +48,13 @@ proc insertdtd { } { xml_output "<!DOCTYPE testsuite \[ <!-- testsuite.dtd --> <!ELEMENT testsuite (test | summary)+> -<!ELEMENT test (log, result, name, prms_id )> - <!ELEMENT log (#PCDATA)> +<!ELEMENT test (input, output, result, name, prms_id )> + <!ELEMENT input (#PCDATA)> + <!ELEMENT output (#PCDATA)> <!ELEMENT result (#PCDATA)> <!ELEMENT name (#PCDATA)> <!ELEMENT prms_id (#PCDATA)> - <!ELEMENT summary (result, description, total)> + <!ELEMENT summary (result, description, total)> <!ELEMENT description (#PCDATA)> <!ELEMENT total (#PCDATA)> \]>" @@ -717,12 +718,17 @@ proc record_test { type message args } { if [info exists errorInfo] { set error $errorInfo } - global expect_out + global expect_out + set l_input0_output1 { 0, 0 } + if { [catch { set l_input0_output1 [split $expect_out(buffer) "\n"] } result]} { + puts stderr "Warning: no input or ouput for test $message!" + } set output "" set output "expect_out(buffer)" xml_output " <test>" - xml_output " <log>$output</log>" + xml_output " <input>[string trimright [lindex $l_input0_output1 0]]</input>" + xml_output " <output>[string trimright [lindex $l_input0_output1 1]]</output>" xml_output " <result>$type</result>" xml_output " <name>$message</name>" xml_output " <prms_id>$prms_id</prms_id>" |