Index: build/android/pylib/base_test_runner.py |
diff --git a/build/android/pylib/base_test_runner.py b/build/android/pylib/base_test_runner.py |
index 5355633282658f15820e5890e704b89b67419f42..5073587712dc76833461f7205adf3851396689cc 100644 |
--- a/build/android/pylib/base_test_runner.py |
+++ b/build/android/pylib/base_test_runner.py |
@@ -106,9 +106,11 @@ class BaseTestRunner(object): |
dest_dir: Absolute path to copy to on the device. |
""" |
for p in test_data_paths: |
+ if not isinstance(p, list): |
bulach
2012/11/15 01:06:39
uh? 103 doesn't say this is allowed, who's passing
Peter Beverloo
2012/11/15 12:11:29
See single_test_runner.py:241; removed.
|
+ p = [p, p] |
self.adb.PushIfNeeded( |
- os.path.join(constants.CHROME_DIR, p), |
- os.path.join(dest_dir, p)) |
+ os.path.join(constants.CHROME_DIR, p[0]), |
+ os.path.join(dest_dir, p[1])) |
def LaunchTestHttpServer(self, document_root, port=None, |
extra_config_contents=None): |