build/android/pylib/junit/test_runner.py - Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0

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/junit/test_runner.py

Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add OfflinePageTestRunner.java to CL Created 4 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

« base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java ('K') | « base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java ('k') | build/config/android/internal_rules.gni » ('j') | build/config/android/internal_rules.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/junit/test_runner.py

diff --git a/build/android/pylib/junit/test_runner.py b/build/android/pylib/junit/test_runner.py

index 9a60c12a991abd28ed2514689a7aa394c0c9ed2e..d10d595aab4fd317ff6c1ea9d4ff94d506d2d3fe 100644

--- a/build/android/pylib/junit/test_runner.py

+++ b/build/android/pylib/junit/test_runner.py

@@ -46,6 +46,11 @@ class JavaTestRunner(object):

# Add JVM arguments.

jvm_args = []

+ # TODO(mikecase): Set this property through GN.

mikecase (-- gone --) 2016/07/31 04:21:09 Would like to replace this with a --robolectric-de

jbudorick 2016/08/01 13:52:04 That sgtm. Fine with leaving it in a separate CL,

+ jvm_args += [

+ '-Drobolectric.dependency.dir=%s' %

+ os.path.join(constants.GetOutDirectory(),

+ 'lib.java', 'third_party', 'robolectric')]

if self._coverage_dir:

if not os.path.exists(self._coverage_dir):

os.makedirs(self._coverage_dir)