Index: build/android/pylib/base/base_test_runner.py |
diff --git a/build/android/pylib/base/base_test_runner.py b/build/android/pylib/base/base_test_runner.py |
index 3fb6c269c787b9888748890ab556ed77dc3349be..eefdc064a6f9cd5a8275f09ce0f79bcbe6a9e0d4 100644 |
--- a/build/android/pylib/base/base_test_runner.py |
+++ b/build/android/pylib/base/base_test_runner.py |
@@ -111,19 +111,19 @@ class BaseTestRunner(object): |
"""Run once after all tests are run.""" |
self.ShutdownHelperToolsForTestSuite() |
- def CopyTestData(self, test_data_paths, dest_dir): |
- """Copies |test_data_paths| list of files/directories to |dest_dir|. |
+ def CopyTestData(self, test_data_paths, dest_root, |
+ src_root=constants.DIR_SOURCE_ROOT): |
bulach
2013/07/04 11:05:21
suggestion: there's only one caller passing the ex
frankf
2013/07/09 01:09:35
Done. I've inlined CopyTestData and removed it all
|
+ """Copies a list of paths from |src_root| to |dst_root|. |
Args: |
- test_data_paths: A list of files or directories relative to |dest_dir| |
- which should be copied to the device. The paths must exist in |
- |DIR_SOURCE_ROOT|. |
- dest_dir: Absolute path to copy to on the device. |
+ test_data_paths: A list of paths relative to root directories. |
+ dest_root: Absolute root path on device. |
+ src_root: Absolute root path on host. |
""" |
for p in test_data_paths: |
self.adb.PushIfNeeded( |
- os.path.join(constants.DIR_SOURCE_ROOT, p), |
- os.path.join(dest_dir, p)) |
+ os.path.join(src_root, p), |
+ os.path.join(dest_root, p)) |
def LaunchTestHttpServer(self, document_root, port=None, |
extra_config_contents=None): |