summaryrefslogtreecommitdiffstats
path: root/build/android/pylib/test_options_parser.py
diff options
context:
space:
mode:
authoraberent@chromium.org <aberent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:43:25 +0000
committeraberent@chromium.org <aberent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:43:25 +0000
commit4f9b0b8d7639fbb4817c4bc1571db70d9d4c2d96 (patch)
tree716ac472ead52124f53eba8a16d5ca450e5c94dc /build/android/pylib/test_options_parser.py
parentd352971b5773ad923749675d1a72d8b2ddfaa768 (diff)
downloadchromium_src-4f9b0b8d7639fbb4817c4bc1571db70d9d4c2d96.zip
chromium_src-4f9b0b8d7639fbb4817c4bc1571db70d9d4c2d96.tar.gz
chromium_src-4f9b0b8d7639fbb4817c4bc1571db70d9d4c2d96.tar.bz2
Upstream remaining differences in android/build python files
Re-enable unit tests in single_test_runner (these are no longer flaky) Allow stack trace, since we now admit we are doing an Android version of Chrome Add keep_test_server_ports option to instrumentation tests. BUG=136980 Review URL: https://chromiumcodereview.appspot.com/11262034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/test_options_parser.py')
-rw-r--r--build/android/pylib/test_options_parser.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/build/android/pylib/test_options_parser.py b/build/android/pylib/test_options_parser.py
index b5e44db..adf3045 100644
--- a/build/android/pylib/test_options_parser.py
+++ b/build/android/pylib/test_options_parser.py
@@ -109,6 +109,12 @@ def AddInstrumentationOptions(option_parser):
help='Serial number of device we should use.')
option_parser.add_option('--python_test_root',
help='Root of the python-driven tests.')
+ option_parser.add_option('--keep_test_server_ports',
+ action='store_true',
+ help='Indicates the test server ports must be '
+ 'kept. When this is run via a sharder '
+ 'the test server ports should be kept and '
+ 'should not be reset.')
option_parser.add_option('--flakiness-dashboard-server',
dest='flakiness_dashboard_server',
help=('Address of the server that is hosting the '