From 21b98d7dbb548cad9cd8783c10665718bdcb3444 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 17 Dec 2011 20:50:15 +0000
Subject: remove --command / -c option and $COMMAND and foo.args

---
 cmdtest | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'cmdtest')

diff --git a/cmdtest b/cmdtest
index fc362ef..e40c7b7 100755
--- a/cmdtest
+++ b/cmdtest
@@ -44,17 +44,12 @@ class CommandTester(cliapp.Application):
 
     def add_settings(self):
         self.settings.string(['command', 'c'], 
-                             'test COMMAND (executable name/path; $PATH is '
-                                'not searched, so give absolute path when '
-                                'necessary)', 
-                             metavar='COMMAND',
-                             default=None)
+                             'ignored for backwards compatibility')
         self.settings.string_list(['test', 't'],
                                   'run only TEST (can be given many times)',
                                   metavar='TEST')
 
     def process_args(self, dirnames):
-        self.settings.require('command')
         self.setup_ttystatus()
 
         td = self.load_tests(dirnames)
@@ -122,7 +117,6 @@ class CommandTester(cliapp.Application):
         env = dict(os.environ)
         env['SRCDIR'] = os.getcwd()
         env['DATADIR'] = self.datadir
-        env['COMMAND'] = os.path.abspath(self.settings['command'])
         return env
 
     def run_test(self, test):
@@ -133,9 +127,7 @@ class CommandTester(cliapp.Application):
         if test.script:
             argv = [test.script]
         else:
-            argv = [self.settings['command']]
-            if test.args:
-                argv.extend(self.expand(self.lines(test.args)))
+            raise cliapp.AppException('Must have a .script file for test')
 
         stdout_name = test.path_prefix + '.stdout-actual'
         stderr_name = test.path_prefix + '.stderr-actual'
-- 
cgit v1.2.1