build/android/pylib/gtest/setup.py - Issue 1075783002: Enable components_browsertests on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1075783002: Enable components_browsertests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix GN build and add java dependency to components/test/DEPS Created 5 years, 8 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:

Index: build/android/pylib/gtest/setup.py

diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py

index 1b882caf3ab7d7904230f6e6bed94879d9236f8f..44662d087caa1cc2db5f702c1132643ac7de40db 100644

--- a/build/android/pylib/gtest/setup.py

+++ b/build/android/pylib/gtest/setup.py

@@ -31,6 +31,7 @@ ISOLATE_FILE_PATHS = {

'third_party/WebKit/Source/platform/heap/BlinkHeapUnitTests.isolate',

'breakpad_unittests': 'breakpad/breakpad_unittests.isolate',

'cc_perftests': 'cc/cc_perftests.isolate',

+ 'components_browsertests': 'components/components_browsertests.isolate',

'components_unittests': 'components/components_unittests.isolate',

'content_browsertests': 'content/content_browsertests.isolate',

'content_unittests': 'content/content_unittests.isolate',

@@ -236,7 +237,8 @@ def Setup(test_options, devices):

tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)

# Coalesce unit tests into a single test per device

- if test_options.suite_name != 'content_browsertests':

+ if (test_options.suite_name != 'content_browsertests' and

+ test_options.suite_name != 'components_browsertests'):

num_devices = len(devices)

tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]

tests = [t for t in tests if t]