Index: native_client_sdk/src/build_tools/test_sdk.py |
diff --git a/native_client_sdk/src/build_tools/test_sdk.py b/native_client_sdk/src/build_tools/test_sdk.py |
index 0c00a09e91fc47255cf56653bf056ba7e2409151..7f1fe05128c5cbc46ec7afc9038d02c52a22ad34 100755 |
--- a/native_client_sdk/src/build_tools/test_sdk.py |
+++ b/native_client_sdk/src/build_tools/test_sdk.py |
@@ -8,7 +8,7 @@ |
This script is normally run immediately after build_sdk.py. |
""" |
-import optparse |
+import argparse |
import os |
import subprocess |
import sys |
@@ -159,15 +159,15 @@ def StepRunBrowserTests(toolchains, experimental): |
def main(args): |
- usage = '%prog [<options>] [<phase...>]' |
- parser = optparse.OptionParser(description=__doc__, usage=usage) |
- parser.add_option('--experimental', help='build experimental tests', |
- action='store_true') |
- parser.add_option('--sanitizer', |
- help='Run sanitizer (asan/tsan/valgrind) tests', |
- action='store_true') |
- parser.add_option('--verbose', '-v', help='Verbose output', |
- action='store_true') |
+ parser = argparse.ArgumentParser(description=__doc__) |
+ parser.add_argument('--experimental', help='build experimental tests', |
+ action='store_true') |
+ parser.add_argument('--sanitizer', |
+ help='Run sanitizer (asan/tsan/valgrind) tests', |
+ action='store_true') |
+ parser.add_argument('--verbose', '-v', help='Verbose output', |
+ action='store_true') |
+ parser.add_argument('phases', nargs="*") |
if 'NACL_SDK_ROOT' in os.environ: |
# We don't want the currently configured NACL_SDK_ROOT to have any effect |
@@ -183,7 +183,7 @@ def main(args): |
except ImportError: |
pass |
- options, args = parser.parse_args(args) |
+ options = parser.parse_args(args) |
pepper_ver = str(int(build_version.ChromeMajorVersion())) |
pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver) |
@@ -210,9 +210,9 @@ def main(args): |
('sel_ldr_tests_valgrind', StepRunSelLdrTests, pepperdir, 'valgrind') |
] |
- if args: |
+ if options.phases: |
phase_names = [p[0] for p in phases] |
- for arg in args: |
+ for arg in options.phases: |
if arg not in phase_names: |
msg = 'Invalid argument: %s\n' % arg |
msg += 'Possible arguments:\n' |
@@ -222,7 +222,7 @@ def main(args): |
for phase in phases: |
phase_name = phase[0] |
- if args and phase_name not in args: |
+ if options.phases and phase_name not in options.phases: |
continue |
phase_func = phase[1] |
phase_args = phase[2:] |