Signed-off-by: Chris Evich <[email protected]>
---
client/bin/autotest | 6 ++++--
client/bin/cmdparser.py | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/client/bin/autotest b/client/bin/autotest
index 36be1cc..6431250 100755
--- a/client/bin/autotest
+++ b/client/bin/autotest
@@ -23,7 +23,10 @@ os.environ['AUTODIRBIN'] = autodirbin
os.environ['AUTODIRTEST'] = autodirtest
os.environ['PYTHONPATH'] = autodirbin
-parser = OptionParser(usage='Usage: %prog [options] <control-file>')
+cmd_parser = cmdparser.CommandParser() # Allow access to instance in parser
+
+parser = OptionParser(usage='Usage: %prog [options] [command] <control-file>',
+ epilog="[command]\t\tOne of: "+str(cmd_parser.cmdlist))
parser.add_option("-a", "--args", dest='args',
help="additional args to pass to control file")
@@ -76,7 +79,6 @@ def usage():
options, args = parser.parse_args()
-cmd_parser = cmdparser.CommandParser()
args = cmd_parser.parse_args(args)
# Check for a control file if not in prebuild mode.
diff --git a/client/bin/cmdparser.py b/client/bin/cmdparser.py
index 7ef6c73..3dbe8c4 100644
--- a/client/bin/cmdparser.py
+++ b/client/bin/cmdparser.py
@@ -68,6 +68,7 @@ class CommandParser(object):
@param args is not used here.
"""
+ print "Commands:"
print "help\t\t\tOutput a list of supported commands"
print "list\t\t\tOutput a list of available tests"
print "run <test> [<args>]\tFind given <test> in path and run with
args"
--
1.7.1
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
