👔 Move side-loaded test data /sdcard -> /sdcard/gtestdata

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

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 a723cfe6726fdb48ec414402d70bcfa0f49687a3..2a61a9a8b7d21a00ad623090def8c39e641aec19 100644
--- a/build/android/pylib/local/device/local_device_gtest_run.py
+++ b/build/android/pylib/local/device/local_device_gtest_run.py
@@ -240,12 +240,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')

[jbudorick, 2016/05/18 14:23:38]

I still don't really like having this hard-coded both here and in UrlUtils.java.
I'm wondering if we can provide this some other way (<meta-data> in the
manifest?) s.t. it's only specified once.

[agrieve, 2016/05/19 02:11:53]

I don't think manifest will work since tests can specify their own manifests.
Command-line flag is also annoying since there are different mechanics for
instrumentation tests / gtests. Perhaps as a bundle extra to the
instrumentation, but I think it's nicer to keep the number of args there low.
Perhaps easiest way would be to just regexp extract the value from the .java
file. However, I think with the name being much more searchable it's fine to
have it in the two spots (it used to be in 3 spots and less searchable, so
marked improvement at least)

[jbudorick, 2016/05/24 19:13:52]

I disagree, particularly with the regexp extraction part, but I can live with
this for now.

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

[jbudorick, 2016/05/18 14:23:38]

check_return=True here and below

[agrieve, 2016/05/19 02:11:53]

Done.

+          dev.RunShellCommand(['mkdir', '-p', device_root])
 
       def init_tool_and_start_servers():
         tool = self.GetTool(dev)