Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Unified Diff: build/android/pylib/gtest/test_package_apk.py

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cbentzel@'s nits Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/gtest/test_package_apk.py
diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py
index 16ef21c6e449030cb8aca8cc2cf2cca115a7ec0d..a679b0358edbb9e3a01b562fdd9fda16f6b51d91 100644
--- a/build/android/pylib/gtest/test_package_apk.py
+++ b/build/android/pylib/gtest/test_package_apk.py
@@ -43,6 +43,11 @@ class TestPackageApk(TestPackage):
else:
self._package_info = constants.PACKAGE_INFO['gtest']
+ if suite_name == 'net_unittests':
+ self._extras = {'RunInSubThread': ''}
Fabrice (no longer in Chrome) 2015/07/31 13:20:29 This has been making the Android/asan bot fail sin
+ else:
+ self._extras = []
+
def _CreateCommandLineFileOnDevice(self, device, options):
device.WriteFile(self._package_info.cmdline_file,
self.suite_name + ' ' + options)
@@ -74,7 +79,8 @@ class TestPackageApk(TestPackage):
device.StartActivity(
intent.Intent(package=self._package_info.package,
activity=self._package_info.activity,
- action='android.intent.action.MAIN'),
+ action='android.intent.action.MAIN',
+ extras=self._extras),
# No wait since the runner waits for FIFO creation anyway.
blocking=False,
force_stop=force_stop)
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698