diff options
author | mef <mef@chromium.org> | 2014-09-29 16:37:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 23:37:48 +0000 |
commit | 408b815de5e406a843075b78cdc33516ff13fd4e (patch) | |
tree | 74204a61d40367efe8f9f71c60a837ba5b849e0e /components/cronet/tools | |
parent | 6b968c06b3641d5cb45917039de447f8337edd4c (diff) | |
download | chromium_src-408b815de5e406a843075b78cdc33516ff13fd4e.zip chromium_src-408b815de5e406a843075b78cdc33516ff13fd4e.tar.gz chromium_src-408b815de5e406a843075b78cdc33516ff13fd4e.tar.bz2 |
Improve cr_cronet.py - pass unknown options to test runner and debugger.
For example "cr_cronet.py test -f *Quic*" will run just Quic tests.
BUG=
Review URL: https://codereview.chromium.org/601863002
Cr-Commit-Position: refs/heads/master@{#297304}
Diffstat (limited to 'components/cronet/tools')
-rwxr-xr-x | components/cronet/tools/cr_cronet.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/components/cronet/tools/cr_cronet.py b/components/cronet/tools/cr_cronet.py index 5aca9a6..59a9351 100755 --- a/components/cronet/tools/cr_cronet.py +++ b/components/cronet/tools/cr_cronet.py @@ -28,8 +28,9 @@ def main(): parser.add_argument('-r', '--release', action='store_true', help='use release configuration') - options = parser.parse_args() + options, unknown_options = parser.parse_known_args() print options + print unknown_options gyp_defines = 'GYP_DEFINES="OS=android enable_websockets=0 '+ \ 'disable_file_support=1 disable_ftp_support=1 '+ \ 'use_icu_alternatives_on_android=1" ' @@ -52,7 +53,14 @@ def main(): return run ('ninja -C ' + out_dir + ' cronet_sample_proguard_apk') if (options.command=='test'): return run ('build/android/test_runner.py instrumentation '+ \ - release_arg + ' --test-apk=CronetTestInstrumentation') + release_arg + ' --test-apk=CronetTestInstrumentation ' + \ + ' '.join(unknown_options)) + if (options.command=='debug'): + return run ('build/android/adb_gdb --start ' + \ + '--activity=.CronetTestActivity ' + \ + '--program-name=CronetTest ' + \ + '--package-name=org.chromium.cronet_test_apk ' + \ + ' '.join(unknown_options)) parser.print_help() return 1 |