build/android/pylib/local/device/local_device_gtest_run.py - Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata

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/local/device/local_device_gtest_run.py

Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase atop https://codereview.chromium.org/2041723006 Created 4 years, 6 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/test_support_android.cc ('K') | « base/test/test_support_android.cc ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/local/device/local_device_gtest_run.py

diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py

index e7af1a27051056a0b15687c6fde545467319873a..90f133bc3129815fe15653561614f88472820ec0 100644

--- a/build/android/pylib/local/device/local_device_gtest_run.py

+++ b/build/android/pylib/local/device/local_device_gtest_run.py

@@ -241,12 +241,16 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):

def push_test_data():

# Push data dependencies.

- external_storage = dev.GetExternalStoragePath()

+ device_root = posixpath.join(dev.GetExternalStoragePath(),

+ 'chromium_tests_root')

data_deps = self._test_instance.GetDataDependencies()

host_device_tuples = [

- (h, d if d is not None else external_storage)

+ (h, d if d is not None else device_root)

for h, d in data_deps]

- dev.PushChangedFiles(host_device_tuples)

+ dev.PushChangedFiles(host_device_tuples, delete_device_stale=True)

+ if not host_device_tuples:

+ dev.RunShellCommand(['rm', '-rf', device_root], check_return=True)

+ dev.RunShellCommand(['mkdir', '-p', device_root], check_return=True)

def init_tool_and_start_servers():

tool = self.GetTool(dev)