build/android/pylib/run_java_tests.py - Issue 10914199: Android: upstream latest changes for build/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/run_java_tests.py

Issue 10914199: Android: upstream latest changes for build/android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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/run_java_tests.py

diff --git a/build/android/pylib/run_java_tests.py b/build/android/pylib/run_java_tests.py

index 725585af001a119806bdef40d49b361772eb811c..448fd423f2777443a883266d9afd239307a782e8 100644

--- a/build/android/pylib/run_java_tests.py

+++ b/build/android/pylib/run_java_tests.py

@@ -65,7 +65,7 @@ def FilterTests(test_names, pattern_list, inclusive):

class TestRunner(BaseTestRunner):

"""Responsible for running a series of tests connected to a single device."""

- _DEVICE_DATA_DIR = constants.TEST_DATA_DIR + '/chrome/test/data'

+ _DEVICE_DATA_DIR = 'chrome/test/data'

_EMMA_JAR = os.path.join(os.environ.get('ANDROID_BUILD_TOP', ''),

'external/emma/lib/emma.jar')

_COVERAGE_MERGED_FILENAME = 'unittest_coverage.es'

@@ -166,6 +166,7 @@ class TestRunner(BaseTestRunner):

'/chrome/test/data/android/device_files')

if os.path.exists(host_test_files_path):

self.adb.PushIfNeeded(host_test_files_path,

+ self.adb.GetExternalStorage() + '/' +

TestRunner._DEVICE_DATA_DIR)

if self.install_apk:

for apk in self.apks:

« no previous file with comments | « build/android/pylib/perf_tests_helper.py ('k') | build/android/pylib/single_test_runner.py » ('j') | no next file with comments »