Bug 1276560 - Package hyphenation-dictionaries separately for reftest…

…s. r=sebastian MozReview-Commit-ID: IRvIqGEfc1m
iaxat · Jul 4, 2016 · a67f13d · a67f13d
1 parent 99db978
commit a67f13d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
@@ -229,6 +229,13 @@ def run_android_test(self, **kwargs):
         kwargs["extraProfileFiles"].append(
             os.path.join(self.topsrcdir, "mobile", "android", "fonts"))
 
+        hyphenation_path = os.path.join(self.topsrcdir, "intl", "locales")
+
+        for (dirpath, dirnames, filenames) in os.walk(hyphenation_path):
+            for filename in filenames:
+                if filename.endswith('.dic'):
+                    kwargs["extraProfileFiles"].append(os.path.join(dirpath, filename))
+
         if not kwargs["httpdPath"]:
             kwargs["httpdPath"] = os.path.join(self.tests_dir, "modules")
         if not kwargs["symbolsPath"]:

diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
@@ -689,12 +689,16 @@ def runSerialTests(self, manifests, options, cmdargs=None):
     def copyExtraFilesToProfile(self, options, profile):
         "Copy extra files or dirs specified on the command line to the testing profile."
         profileDir = profile.profile
+        if not os.path.exists(os.path.join(profileDir, "hyphenation")):
+            os.makedirs(os.path.join(profileDir, "hyphenation"))
         for f in options.extraProfileFiles:
             abspath = self.getFullPath(f)
             if os.path.isfile(abspath):
                 if os.path.basename(abspath) == 'user.js':
                     extra_prefs = mozprofile.Preferences.read_prefs(abspath)
                     profile.set_preferences(extra_prefs)
+                elif os.path.basename(abspath).endswith('.dic'):
+                    shutil.copy2(abspath, os.path.join(profileDir, "hyphenation"))
                 else:
                     shutil.copy2(abspath, profileDir)
             elif os.path.isdir(abspath):

diff --git a/testing/mozharness/configs/android/androidarm.py b/testing/mozharness/configs/android/androidarm.py
@@ -74,6 +74,7 @@
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
                 "--extra-profile-file=fonts",
+                "--extra-profile-file=hyphenation",
                 "--screenshot-on-fail",
             ],
         },
@@ -164,6 +165,7 @@
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=16",
                 "--extra-profile-file=fonts",
+                "--extra-profile-file=hyphenation",
                 "--suite=reftest",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",

diff --git a/testing/mozharness/configs/android/androidarm_4_3.py b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -78,6 +78,7 @@
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
                 "--extra-profile-file=fonts",
+                "--extra-profile-file=hyphenation",
                 "--screenshot-on-fail",
             ],
         },
@@ -201,6 +202,7 @@
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=16",
                 "--extra-profile-file=fonts",
+                "--extra-profile-file=hyphenation",
                 "--suite=reftest",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
@@ -223,6 +225,7 @@
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=48",
                 "--extra-profile-file=fonts",
+                "--extra-profile-file=hyphenation",
                 "tests/layout/reftests/reftest.list",
             ],
         },