aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--runtest.exp16
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index fdcbc20..83d2f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2018-12-16 Jacob Bachmeyer <jcb62281@gmail.com>
+ * runtest.exp: Move processing of -V|--version option to first
+ pass through command line arguments instead of delaying it.
+
+2018-12-16 Jacob Bachmeyer <jcb62281@gmail.com>
+
* Makefile.am (RUNTESTDEFAULTFLAGS): Remove; no longer needed.
* Makefile.in: Regenerate.
diff --git a/runtest.exp b/runtest.exp
index 09ffcf0..bea8f29 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -450,6 +450,14 @@ for { set i 0 } { $i < $argc } { incr i } {
}
switch -glob -- $option {
+ "--V*" -
+ "--vers*" { # (--version) version numbers
+ 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
+ }
+
"--bu*" { # (--build) the build host configuration
set arg_build_triplet $optarg
continue
@@ -1060,14 +1068,6 @@ for { set i 0 } { $i < $argc } { incr i } {
}
switch -glob -- $option {
- "--V*" -
- "--vers*" { # (--version) version numbers
- 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
# Already parsed.
continue