From cd7fd23606bf833d4cde02b63e6d1e2e99466235 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 9 May 2015 11:40:01 -0500
Subject: [PATCH] wvtestrun: move to wvtest and add "run" argument

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
Reviewed-by: Gabriel Filion <gabster@lelutin.ca>
---
 Makefile            | 2 +-
 wvtestrun => wvtest | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename wvtestrun => wvtest (93%)

diff --git a/Makefile b/Makefile
index 6c4053a..666c0f7 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ stupid:
 	PATH=/bin:/usr/bin $(MAKE) test
 
 test: all
-	./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
+	./wvtest run $(MAKE) PYTHON=$(PYTHON) runtests-python runtests-cmdline
 
 check: test
 
diff --git a/wvtestrun b/wvtest
similarity index 93%
rename from wvtestrun
rename to wvtest
index 183e066..2359bce 100755
--- a/wvtestrun
+++ b/wvtest
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 #
 # WvTest:
-#   Copyright (C)2007-2009 Versabanq Innovations Inc. and contributors.
+#   Copyright (C) 2007-2009 Versabanq Innovations Inc. and contributors.
+#   Copyright (C) 2015 Rob Browning <rlb@defaultvalue.org>
 #       Licensed under the GNU Library General Public License, version 2.
 #       See the included file named LICENSE for license information.
 #
@@ -12,11 +13,13 @@ use Time::HiRes qw(time);
 # always flush
 $| = 1;
 
-if (@ARGV < 1) {
-    print STDERR "Usage: $0 <command line...>\n";
+if (@ARGV < 2 || $ARGV[0] ne 'run') {
+    print STDERR "Usage: run $0 <command line...>\n";
     exit 127;
 }
 
+shift @ARGV;
+
 print STDERR "Testing \"all\" in @ARGV:\n";
 
 my $pid = open(my $fh, "-|");
-- 
2.39.2