Run foo.script instead of using foo.args, when script exists.

1 files changed, 7 insertions, 3 deletions

diff --git a/cmdtest b/cmdtest
index f2757f9..4d9f183 100755
--- a/cmdtest
+++ b/cmdtest
@@ -101,6 +101,7 @@ class CommandTester(cliapp.Application):
     def add_to_env(self):
         env = dict(os.environ)
         env['DATADIR'] = self.datadir
+        env['COMMAND'] = self.settings['command']
         return env
 
     def run_test(self, test):
@@ -108,9 +109,12 @@ class CommandTester(cliapp.Application):
 
         self.run_script(test.setup)
 
-        argv = [self.settings['command']]
-        if test.args:
-            argv.extend(self.expand(self.lines(test.args)))
+        if test.script:
+            argv = [test.script]
+        else:
+            argv = [self.settings['command']]
+            if test.args:
+                argv.extend(self.expand(self.lines(test.args)))
 
         stdin = self.cat(test.stdin or '/dev/null')
         exit, out, err = self.runcmd_unchecked(argv,