* runtest.exp: Refer to "DejaGnu version", not "Framework

	version" in --version output.
	* testsuite/runtest.all/options.exp: Update test case.

diff --git a/ChangeLog b/ChangeLog
index 9e986c3..ab7938e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-16  Ben Elliston  <bje@gnu.org>
+
+       * runtest.exp: Refer to "DejaGnu version", not "Framework
+       version" in --version output.
+       * testsuite/runtest.all/options.exp: Update test case.
+
 2015-11-14  Ben Elliston  <bje@gnu.org>
 
        * runtest.exp (usage): Improve help text.

diff --git a/runtest.exp b/runtest.exp
index 55e4024..08927bf 100644 (file)
--- a/runtest.exp
+++ b/runtest.exp
@@ -1025,9 +1025,9 @@ 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"
-           send_user "Framework version is\t$frame_version\n"
            exit
        }
 

diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp
index 3d3a9c2..70870f1 100644 (file)
--- a/testsuite/runtest.all/options.exp
+++ b/testsuite/runtest.all/options.exp
@@ -48,7 +48,7 @@ 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" "Expect version is.*Tcl version is.*Framework version is*" "--version" }
+    { "-V" "DejaGnu version is.*Expect version is.*Tcl version is.*" "--version" }
     { "-v --target m68k-vxworks" "Target is m68k-vxworks" "--target option" }
     { "-v --host sparc-sun-sunos4.1.9" "Native configuration is sparc-sun-sunos4.1.9" "--host option" }
     { "-v -a" "Print all test output to screen" "--all option" }