Re: dejagnu patch for XML output

[bemis]

Prakash,
I have attached the patch.
 I been having problems with make check on dejagnu itself with this patch.
This patch WILL NOT allow dejagnu to make check on itself.  It has to do with
the  bluegnu part of dejagnu that isn't developed anymore.
I am working on a work around for this, and then I'll put the patch into cvs.
be careful, and let me know how it works.  any comments/suggestions about
adding more to the xml output are appreciated too.
matt bemis


"M. V. Prakash" wrote:

> Hi Matt,
> Thanks. I saw your mail in the mail archives and noticed that calc.xml has
> additional fields that make the output more useful. Does your mail have the
> complete patch so that I can pick it up from it and apply to the 1.4.3
> release?
>
> regards
> Prakash
> ----- Original Message -----
> From: "bemis" <address@hidden>
> To: "M. V. Prakash" <address@hidden>
> Sent: Tuesday, October 29, 2002 5:50 PM
> Subject: Re: dejagnu patch for XML output
>
> > Hello,
> > I have to put the XML patch into the repository.  If there is a new
> > release I think it may be a while.  I can give you the patch for the
> > input/output, and you can apply it to the 1.4.3 release.
> > Matt
> > On Tue, 2002-10-29 at 02:44, M. V. Prakash wrote:
> > > Hi,
> > > I'm new to this list...
> > >
> > > Will the patch for XML output (which generates the input and output
> elements
> > > in calc.xml) be included in the next release of dejagnu?
> > >
> > > thanks
> > > Prakash
> > > ---
> > >
> > > this is a patch for runtest -x
> > > I have attached the patch and a the calc.xml generated from runtest -x
> > >
> > > Matt Bemis
> > >
> > >
> > >
> > > _______________________________________________
> > > DejaGnu mailing list
> > > address@hidden
> > > http://mail.gnu.org/mailman/listinfo/dejagnu
> >
> >

diff -urN dejagnu-1.4.3-orig/ChangeLog dejagnu-1.4.3-dev/ChangeLog
--- dejagnu-1.4.3-orig/ChangeLog        Wed Sep  4 19:24:20 2002
+++ dejagnu-1.4.3-dev/ChangeLog Mon Oct 21 16:43:08 2002
@@ -1,3 +1,7 @@
+2002-10-21  Matt Bemis  <address@hidden>
+       * added input/output to xml_output in lib/framework.exp
+       * removed the log feature replaced by input/output_xml
+
 2002-09-04  Rob Savoye  <address@hidden>
 
        * Clean.tcl (cleanfiles): Add more patterns to remove.
@@ -5959,4 +5963,4 @@
 
 Wed Jun  5 14:52:15 PDT 2002   Joey Ekstrom <address@hidden>
        * dejagnu.h: modfied C functions to behave like printf.
-       
\ No newline at end of file
+       
diff -urN dejagnu-1.4.3-orig/lib/framework.exp 
dejagnu-1.4.3-dev/lib/framework.exp
--- dejagnu-1.4.3-orig/lib/framework.exp        Sat Aug 31 01:46:16 2002
+++ dejagnu-1.4.3-dev/lib/framework.exp Mon Oct 21 16:40:58 2002
@@ -48,12 +48,13 @@
     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,13 @@
         if [info exists errorInfo] {
            set error $errorInfo
         }
-        global expect_out
-       
+        global expect_out 
+       set l_input0_output1 [split $expect_out(buffer) "\n"]
         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>"