Changeset 144822 in webkit

Timestamp:

Mar 5, 2013 2:46:57 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Copy dictionary to the external storage before running layout test on android
​https://bugs.webkit.org/show_bug.cgi?id=111480

Patch by Min Qin <​qinmin@chromium.org> on 2013-03-05
Reviewed by Adam Barth.

TestWebKitPlatformSupport now needs to read an external dictionary file.
This file does not exist on the device. We need to copy it before running layout tests.

• Scripts/webkitpy/layout_tests/port/chromium_android.py:

(ChromiumAndroidDriver._setup_md5sum_and_push_data_if_needed):
(ChromiumAndroidDriver._push_platform_resources):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_android.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-05  Min Qin  <qinmin@chromium.org>
+
+        Copy dictionary to the external storage before running layout test on android
+        https://bugs.webkit.org/show_bug.cgi?id=111480
+
+        Reviewed by Adam Barth.
+
+        TestWebKitPlatformSupport now needs to read an external dictionary file.
+        This file does not exist on the device. We need to copy it before running layout tests.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+        (ChromiumAndroidDriver._setup_md5sum_and_push_data_if_needed):
+        (ChromiumAndroidDriver._push_platform_resources):
+
 2013-03-05  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py

@@ -151 +151 @@
 ]
 
+# List of test resources from webkit platform. These resources will be copied to the external storage.
+WEBKIT_PLATFORM_RESOURCES_TO_PUSH = [
+    'third_party/hyphen/hyph_en_US.dic',
+]
+
 MD5SUM_DEVICE_FILE_NAME = 'md5sum_bin'
 MD5SUM_DEVICE_PATH = '/data/local/tmp/' + MD5SUM_DEVICE_FILE_NAME
@@ -572 +577 @@
         self._push_fonts()
         self._push_test_resources()
+        self._push_platform_resources()
 
     def _setup_test(self):
@@ -647 +653 @@
         for resource in TEST_RESOURCES_TO_PUSH:
             self._push_file_if_needed(self._port.layout_tests_dir() + '/' + resource, DEVICE_LAYOUT_TESTS_DIR + resource)
+
+    def _push_platform_resources(self):
+        self._log_debug('Pushing platform resources')
+        external_storage = self._port._filesystem.join(self._run_adb_command(['shell', 'echo $EXTERNAL_STORAGE']).strip(), 'Source', 'WebKit', 'chromium')
+        for resource in WEBKIT_PLATFORM_RESOURCES_TO_PUSH:
+            self._push_file_if_needed(self._port._chromium_base_dir(self._port._filesystem) + '/' + resource, external_storage + '/' + resource)
 
     def _restart_adb_as_root(self):