diff options
author | Tom Tromey <tromey@redhat.com> | 2012-06-12 21:27:56 +1000 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2012-06-12 21:27:56 +1000 |
commit | 2939bf452ee0afa910426c1ecf4c0f2aeff68ed3 (patch) | |
tree | c9b98ba392b4965d2005003c7e7d5dac5c34c486 | |
parent | dbd264c646362691407299d14fb1d18443ab1ef8 (diff) | |
download | dejagnu-2939bf452ee0afa910426c1ecf4c0f2aeff68ed3.zip dejagnu-2939bf452ee0afa910426c1ecf4c0f2aeff68ed3.tar.gz dejagnu-2939bf452ee0afa910426c1ecf4c0f2aeff68ed3.tar.bz2 |
* doc/runtest.1: Update.
* runtest.exp (xml_file_name): New global.
(usage): Update.
Handle optional argument to --xml.
* lib/framework.exp (open_logs): Respect xml_file_name.
Signed-off-by: Ben Elliston <bje@gnu.org>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | doc/runtest.1 | 5 | ||||
-rw-r--r-- | lib/framework.exp | 8 | ||||
-rw-r--r-- | runtest.exp | 8 |
4 files changed, 22 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2012-06-11 Tom Tromey <tromey@redhat.com> + + * doc/runtest.1: Update. + * runtest.exp (xml_file_name): New global. + (usage): Update. + Handle optional argument to --xml. + * lib/framework.exp (open_logs): Respect xml_file_name. + 2012-03-24 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * runtest.exp (load_tool_init): Fix typo in -de option handling. diff --git a/doc/runtest.1 b/doc/runtest.1 index cec1e45..d657652 100644 --- a/doc/runtest.1 +++ b/doc/runtest.1 @@ -92,8 +92,9 @@ Use more than once to increase output further. .B --version,\ -V Prints out the versions of DejaGnu, Expect and Tcl. .TP -.B --xml,\ -x -Generate XML output. +.B --xml[=FILE],\ -x +Generate XML output. \fBFILE\fR is optional; if given it is the name of +the output file. If not given, the output file is named after the tool. .TP .B -D[number] Activate the Tcl debugger. \fBnumber\fR can be either 1 or 0. If it diff --git a/lib/framework.exp b/lib/framework.exp index 5871ecc..8273882 100644 --- a/lib/framework.exp +++ b/lib/framework.exp @@ -1,5 +1,5 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -65,6 +65,7 @@ proc open_logs { } { global tool global sum_file global xml_file + global xml_file_name global xml if { ${tool} == "" } { @@ -74,7 +75,10 @@ proc open_logs { } { set sum_file [open [file join $outdir $tool.sum] w] if { $xml } { catch "file delete -force -- $outdir/$tool.xml" - set xml_file [open [file join $outdir $tool.xml] w] + if { ![string compare $xml_file_name ""] } { + set xml_file_name $tool.xml + } + set xml_file [open [file join $outdir $xml_file_name] w] xml_output "<?xml version=\"1.0\"?>" insertdtd xml_output "<testsuite>" diff --git a/runtest.exp b/runtest.exp index b32181a..a7ad7a0 100644 --- a/runtest.exp +++ b/runtest.exp @@ -1,6 +1,6 @@ # runtest.exp -- Test framework driver # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -# 2001, 2002, 2003 Free Software Foundation, Inc. +# 2001, 2002, 2003, 2012 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -55,7 +55,8 @@ set kfail_flag 0 ;# indicates that it is a known failure set kfail_prms 0 ;# bug id for the description of the known failure set sum_file "" ;# name of the file that contains the summary log set base_dir "" ;# the current working directory -set xml_file "" ;# name of the xml output if requested +set xml_file_name "" ;# name of the xml output if requested +set xml_file "" ;# handle on the xml file if requested set xml 0 ;# flag for requesting xml set logname "" ;# the users login name set prms_id 0 ;# GNATS prms id number @@ -395,7 +396,7 @@ proc usage { } { send_user "\t--directory (-di) name\tRun only the tests in directory 'name'\n" send_user "\t--verbose (-v)\t\tEmit verbose output\n" send_user "\t--version (-V)\t\tEmit all version numbers\n" - send_user "\t--xml (-x)\t\tTurn on XML output generation\n" + send_user "\t--xml\[=name\] (-x)\tTurn on XML output generation\n" send_user "\t--D\[0-1\]\t\tTcl debugger\n" send_user "\tscript.exp\[=arg(s)\]\tRun these tests only\n" if { [info exists tool] } { @@ -1168,6 +1169,7 @@ for { set i 0 } { $i < $argc } { incr i } { } "--x*" { + set xml_file_name $optarg set xml 1 verbose "XML logging turned on" continue |