* runtest.exp (runtest): Introduce new --log_dialog option.

	* doc/runtest.1: Document it.
	* doc/user.xml: Likewise.
	* doc/dejagnu.texi: Regenerate.

Signed-off-by: Ben Elliston <bje@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index d578e23..8817bbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-15  Filipe Brandenburger  <filbranden@google.com>
+
+       * runtest.exp (runtest): Introduce new --log_dialog option.
+       * doc/runtest.1: Document it.
+       * doc/user.xml: Likewise.
+       * doc/dejagnu.texi: Regenerate.
+
 2015-05-14  Steve Ellcey  <sellcey@imgtec.com>
 
        * baseboards/multi-sim.exp (get_library_dirlist): New.

diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index fc788d5..bc5d388 100644 (file)
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -1488,6 +1488,13 @@ and the detailed log files
 log @file{dbg.log} always appears (when requested) in
 the local directory.
 
+@item @code{--log_dialog}
+Emit Expect output to stdout.
+The @emph{expect} output is usually only written to
+@file{tool.log}. By enabling this option, they are also
+be printed to the stdout of the @emph{runtest}
+invocation.
+
 @item @code{--reboot [name]}
 Reboot the target board when
 @emph{runtest} initializes. Usually, when running tests

diff --git a/doc/runtest.1 b/doc/runtest.1
index 5b87096..e3fcef0 100644 (file)
--- a/doc/runtest.1
+++ b/doc/runtest.1
@@ -53,6 +53,9 @@ The network HOSTNAME of the target board.
 .BI --outdir \ DIRECTORY
 The name of a DIRECTORY for test log output.
 .TP
+.B --log_dialog
+Emit Expect output to stdout.
+.TP
 .B --reboot
 Reboot the target board when \fBruntest\fR initializes
 (if supported).

diff --git a/doc/user.xml b/doc/user.xml
index f7e55c0..c2c2e0a 100644 (file)
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -1041,6 +1041,15 @@ powerpc-linux-gcc -g -O2 -o calc calc.o
        </varlistentry>
 
         <varlistentry>
+          <term><option>--log_dialog</option></term>
+         <listitem><para>Emit Expect output to stdout.
+         The <emphasis>expect</emphasis> output is usually only written to
+         <filename>tool.log</filename>. By enabling this option, they are also
+         be printed to the stdout of the <emphasis>runtest</emphasis>
+         invocation.</para></listitem>
+       </varlistentry>
+
+        <varlistentry>
           <term><option>--reboot [name]</option></term>
          <listitem><para>Reboot the target board when
          <emphasis>runtest</emphasis> initializes. Usually, when running tests

diff --git a/runtest.exp b/runtest.exp
index ad4db19..da579ec 100644 (file)
--- a/runtest.exp
+++ b/runtest.exp
@@ -133,6 +133,9 @@ if {![info exists tracelevel]} {
 if {![info exists verbose]} {
     set verbose 0
 }
+if {![info exists log_dialog]} {
+    set log_dialog 0
+}
 
 #
 # verbose [-n] [-log] [--] message [level]
@@ -385,6 +388,7 @@ proc usage { } {
     send_user "\t--ignore \[name(s)\]\tThe names of specific tests to ignore\n"
     send_user "\t--objdir \[name\]\t\tThe test suite binary directory\n"
     send_user "\t--outdir \[name\]\t\tThe directory to put logs in\n"
+    send_user "\t--log_dialog\t\t\Emit Expect output on stdout\n"
     send_user "\t--reboot \[name\]\t\tReboot the target (if supported)\n"
     send_user "\t--srcdir \[name\]\t\tThe test suite source code directory\n"
     send_user "\t--strace \[number\]\tSet expect tracing ON\n"
@@ -1111,6 +1115,11 @@ for { set i 0 } { $i < $argc } { incr i } {
            continue
        }
 
+       "--log_dialog*" {
+           incr log_dialog
+           continue
+       }
+
        "*.exp" {                       #  specify test names to run
            set all_runtests($option) ""
            verbose "Running only tests $option"
@@ -1214,7 +1223,7 @@ if {![info exists tool]} {
 #
 # initialize a few Tcl variables to something other than their default
 #
-if { $verbose > 2 } {
+if { $verbose > 2 || $log_dialog } {
     log_user 1
 } else {
     log_user 0