From e7a25cb373dd70dd83b86582c982a11427bfa270 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 6 Nov 2015 12:01:33 -0700
Subject: [PATCH] Bug 1197716 - On Android, include fonts in test profile;
 r=jmaher

---
 layout/tools/reftest/mach_commands.py                      | 2 +-
 testing/mozharness/configs/android/android_panda_releng.py | 2 ++
 testing/mozharness/configs/android/androidarm.py           | 2 ++
 testing/mozharness/configs/android/androidarm_4_3.py       | 3 +++
 testing/testsuite-targets.mk                               | 3 +++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
index 619ed6d7e7ce..362523dbb943 100644
--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -236,7 +236,7 @@ class ReftestRunner(MozbuildObject):
             kwargs["tests"] = [os.path.join(*default_manifest[kwargs["suite"]])]
 
         kwargs["extraProfileFiles"].append(
-            os.path.join(self.topobjdir, "dist", "bin", "res", "fonts"))
+            os.path.join(self.topsrcdir, "mobile", "android", "fonts"))
 
         if not kwargs["httpdPath"]:
             kwargs["httpdPath"] = os.path.join(self.tests_dir, "modules")
diff --git a/testing/mozharness/configs/android/android_panda_releng.py b/testing/mozharness/configs/android/android_panda_releng.py
index 8b1e0e5a3cbd..999832f4abbc 100644
--- a/testing/mozharness/configs/android/android_panda_releng.py
+++ b/testing/mozharness/configs/android/android_panda_releng.py
@@ -152,6 +152,7 @@ config = {
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--extra-profile-file=mochitest/fonts",
                 "--screenshot-on-fail",
             ],
             "run_filename": "runtestsremote.py",
@@ -168,6 +169,7 @@ config = {
                 "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s",
                 "--symbols-path=%(symbols_path)s",
+                "--extra-profile-file=reftest/fonts",
                 "--suite=reftest",
             ],
             "tests": ["reftest/tests/layout/reftests/reftest.list"],
diff --git a/testing/mozharness/configs/android/androidarm.py b/testing/mozharness/configs/android/androidarm.py
index ce7ac695c846..2facdad4ba41 100644
--- a/testing/mozharness/configs/android/androidarm.py
+++ b/testing/mozharness/configs/android/androidarm.py
@@ -73,6 +73,7 @@ config = {
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--extra-profile-file=fonts",
                 "--screenshot-on-fail",
             ],
         },
@@ -140,6 +141,7 @@ config = {
                 "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=16",
+                "--extra-profile-file=fonts",
                 "--suite=reftest",
             ],
             "tests": ["tests/layout/reftests/reftest.list"],
diff --git a/testing/mozharness/configs/android/androidarm_4_3.py b/testing/mozharness/configs/android/androidarm_4_3.py
index 5be9724c81d0..0f17cb886229 100644
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -77,6 +77,7 @@ config = {
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--extra-profile-file=fonts",
                 "--screenshot-on-fail",
             ],
         },
@@ -138,6 +139,7 @@ config = {
                 "--httpd-path", "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=16",
+                "--extra-profile-file=fonts",
                 "--suite=reftest",
             ],
             "tests": ["tests/layout/reftests/reftest.list",],
@@ -158,6 +160,7 @@ config = {
                 "--httpd-path", "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=48",
+                "--extra-profile-file=fonts",
                 "tests/layout/reftests/reftest.list",
             ],
         },
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index c7f2adf0a075..187b6cc2658f 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -174,6 +174,7 @@ REMOTE_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/remotereftest.py \
   --dm_trans=$(DM_TRANS) --ignore-window-size \
   --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
   --httpd-path=_tests/modules --suite reftest \
+  --extra-profile-file=$(topsrcdir)/mobile/android/fonts \
   $(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log
 
 RUN_REFTEST_B2G = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftestb2g.py \
@@ -489,6 +490,8 @@ endif
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/watcher/Watcher.apk $(PKG_STAGE)/bin
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/fencp/FenCP.apk $(PKG_STAGE)/bin
 	$(NSINSTALL) $(DEPTH)/build/mobile/sutagent/android/ffxcp/FfxCP.apk $(PKG_STAGE)/bin
+	$(NSINSTALL) $(topsrcdir)/mobile/android/fonts $(DEPTH)/_tests/reftest
+	$(NSINSTALL) $(topsrcdir)/mobile/android/fonts $(DEPTH)/_tests/testing/mochitest
 
 stage-jetpack: make-stage-dir
 	$(MAKE) -C $(DEPTH)/addon-sdk stage-tests-package