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

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
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)

Powered by Google App Engine
This is Rietveld 408576698