Bug 1496627 - Run the emulator automatically r=gbrown
authorWes Kocher <wkocher@mozilla.com>
Wed, 10 Oct 2018 23:49:35 +0000
changeset 499087 5417a70931826b18300de9c0b040d3a1976c02a7
parent 499086 a5fe00a3b11656f4cc51386913733e51b6617b1a
child 499088 9605a2bb0c596ed1badeead50ebd3f47d8378d6f
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1496627
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1496627 - Run the emulator automatically r=gbrown Differential Revision: https://phabricator.services.mozilla.com/D8260
testing/web-platform/mach_commands.py
--- a/testing/web-platform/mach_commands.py
+++ b/testing/web-platform/mach_commands.py
@@ -22,22 +22,28 @@ from mach.decorators import (
 
 from mach_commands_base import WebPlatformTestsRunner, create_parser_wpt
 
 
 class WebPlatformTestsRunnerSetup(MozbuildObject):
     default_log_type = "mach"
 
     def kwargs_common(self, kwargs):
+        from mozrunner.devices.android_device import verify_android_device
         build_path = os.path.join(self.topobjdir, 'build')
         here = os.path.split(__file__)[0]
         tests_src_path = os.path.join(here, "tests")
         if build_path not in sys.path:
             sys.path.append(build_path)
 
+        if kwargs["product"] == "fennec":
+            verify_android_device(self, install=True, verbose=False, xre=True)
+            if kwargs["certutil_binary"] is None:
+                kwargs["certutil_binary"] = os.path.join(os.environ.get('MOZ_HOST_BIN'), "certutil")
+
         if kwargs["config"] is None:
             kwargs["config"] = os.path.join(self.topobjdir, '_tests', 'web-platform', 'wptrunner.local.ini')
 
         if kwargs["prefs_root"] is None:
             kwargs["prefs_root"] = os.path.join(self.topsrcdir, 'testing', 'profiles')
 
         if kwargs["stackfix_dir"] is None:
             kwargs["stackfix_dir"] = self.bindir