* runtest.exp: Improve --version (-v) output.

	* testsuite/runtest.all/options.exp: Update test case.

diff --git a/runtest.exp b/runtest.exp
index 7a4cf66..6fd78f7 100644 (file)
--- a/runtest.exp
+++ b/runtest.exp
@@ -1014,10 +1014,10 @@ for { set i 0 } { $i < $argc } { incr i } {
     switch -glob -- $option {
        "--V*" -
        "--vers*" {                     # (--version) version numbers
-           send_user "DejaGnu version is\t$frame_version\n"
-           send_user "Expect version is\t[exp_version]\n"
-           send_user "Tcl version is\t\t[ info tclversion ]\n"
-           exit
+           send_user "DejaGnu version\t$frame_version\n"
+           send_user "Expect version\t[exp_version]\n"
+           send_user "Tcl version\t[ info tclversion ]\n"
+           exit 0
        }
 
        "--v*" {                        # (--verbose) verbose output

diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp
index 6a3d36a..3b5fc31 100644 (file)
--- a/testsuite/runtest.all/options.exp
+++ b/testsuite/runtest.all/options.exp
@@ -48,7 +48,6 @@ set tests {
     { "--tool x" "Couldn't find tool init file" "Bad tool name" }
     { "--help" "USAGE:*" "Display help" }
     { "-v -v -v" "Verbose level is 3" "Verbose set correctly" }
-    { "-V" "DejaGnu version is.*Expect version is.*Tcl version is.*" "--version" }
     { "-v --target m68k-vxworks" "Target is m68k-vxworks" "--target option" }
     { "-v --target_board flash" "Running target flash" "--target_board option" }
     { "-v --host sparc-sun-sunos4.1.9" "Native configuration is sparc-sun-sunos4.1.9" "--host option" }
@@ -61,8 +60,8 @@ set tests {
     { "-v --reboot" "Will reboot the target" "--reboot option" }
     { "-v --strace 1" "Source Trace level is now 1.* 1  if" "--strace option" }
     { "-v --D0" "Tcl debugger is ON" "--D0 option" }
-    { "-v -V" "DejaGnu version is" "-V option" }
-    { "-v --version" "DejaGnu version is" "--version option" }
+    { "-V" "DejaGnu version.*Expect version.*Tcl version.*" "-V option" }
+    { "--version" "DejaGnu version.*Expect version.*Tcl version.*" "--version option" }
     { "-v --xml" "XML logging turned on" "--xml option" }
 }