# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2014-03-25 04:37:33
# Node ID 723e41ad59b4c0a2e2afe110d13544c3a6c3a25f
# Parent  3d38ebb586fe5a3bb74c68c2464f948ede39e63d

run-tests: Pass arguments into argument parser

Before, arguments were not passed into the optparse.OptionParser
instance and were coming from sys.argv. This patch enables consumers to
define the list of arguments to parse without having to adjust sys.argv.

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -133,7 +133,7 @@ def parselistfiles(files, listtype, warn
         f.close()
     return entries
 
-def parseargs():
+def parseargs(args):
     parser = optparse.OptionParser("%prog [options] [tests]")
 
     # keep these sorted
@@ -210,7 +210,7 @@ def parseargs():
     for option, (envvar, default) in defaults.items():
         defaults[option] = type(default)(os.environ.get(envvar, default))
     parser.set_defaults(**defaults)
-    (options, args) = parser.parse_args()
+    (options, args) = parser.parse_args(args)
 
     # jython is always pure
     if 'java' in sys.platform or '__pypy__' in sys.modules:
@@ -1176,8 +1176,8 @@ def runtests(options, tests):
 testtypes = [('.py', pytest, '.out'),
              ('.t', tsttest, '')]
 
-def main():
-    (options, args) = parseargs()
+def main(args):
+    (options, args) = parseargs(args)
     os.umask(022)
 
     checktools()
@@ -1299,4 +1299,4 @@ def main():
         cleanup(options)
 
 if __name__ == '__main__':
-    main()
+    main(sys.argv[1:])