revert to most recent merge from central
authorMyk Melez <myk@mozilla.org>
Mon, 20 Jul 2015 10:31:54 -0700
changeset 326836 097acaf0a86b5431b6e4a3f7d4f637ba4b29acfc
parent 326835 ddae92629ed62b855f0b4f804473194ff30e5f88
child 326837 af222bda1769a1c8165309639b9de6ef0da0be52
push id10169
push userdminor@mozilla.com
push dateThu, 28 Jan 2016 13:10:48 +0000
milestone42.0a1
revert to most recent merge from central
testing/config/mozharness/linux_config.py
testing/config/mozharness/mac_config.py
testing/config/mozharness/taskcluster_linux_config.py
testing/config/mozharness/windows_config.py
testing/mochitest/mach_commands.py
testing/mochitest/runtests.py
testing/mozharness/mozharness.json
--- a/testing/config/mozharness/linux_config.py
+++ b/testing/config/mozharness/linux_config.py
@@ -86,16 +86,18 @@ config = {
         },
         "webapprt": {
             "options": [
                 "--app=%(app_path)s",
                 "--utility-path=tests/bin",
                 "--extra-profile-file=tests/bin/plugins",
                 "--symbols-path=%(symbols_path)s",
                 "--certificate-path=tests/certs",
+                "--autorun",
+                "--close-when-done",
                 "--console-level=INFO",
                 "--testing-modules-dir=tests/modules",
                 "--quiet"
             ],
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
         "xpcshell": {
--- a/testing/config/mozharness/mac_config.py
+++ b/testing/config/mozharness/mac_config.py
@@ -61,21 +61,22 @@ config = {
                 "--symbols-path=%(symbols_path)s"
             ],
             "run_filename": "runreftest.py",
             "testsdir": "reftest"
         },
         "webapprt": {
             "options": [
                 "--app=%(app_path)s",
-                "--xre-path=%(abs_res_dir)s",
                 "--utility-path=tests/bin",
                 "--extra-profile-file=tests/bin/plugins",
                 "--symbols-path=%(symbols_path)s",
                 "--certificate-path=tests/certs",
+                "--autorun",
+                "--close-when-done",
                 "--console-level=INFO",
                 "--testing-modules-dir=tests/modules",
                 "--quiet"
             ],
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
         "xpcshell": {
--- a/testing/config/mozharness/taskcluster_linux_config.py
+++ b/testing/config/mozharness/taskcluster_linux_config.py
@@ -11,17 +11,17 @@ config = {
         "--appname=%(binary_path)s", "--utility-path=tests/bin",
         "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s",
         "--certificate-path=tests/certs", "--setpref=webgl.force-enabled=true",
         "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail",
     ],
     "webapprt_options": [
         "--app=%(app_path)s", "--utility-path=tests/bin",
         "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s",
-        "--certificate-path=tests/certs",
+        "--certificate-path=tests/certs", "--autorun", "--close-when-done",
         "--console-level=INFO", "--testing-modules-dir=tests/modules",
         "--quiet"
     ],
     "xpcshell_options": [
         "--symbols-path=%(symbols_path)s",
         "--test-plugin-path=%(test_plugin_path)s"
     ],
     "cppunittest_options": [
--- a/testing/config/mozharness/windows_config.py
+++ b/testing/config/mozharness/windows_config.py
@@ -65,16 +65,18 @@ config = {
         },
         "webapprt": {
             "options": [
                 "--app=%(app_path)s",
                 "--utility-path=tests/bin",
                 "--extra-profile-file=tests/bin/plugins",
                 "--symbols-path=%(symbols_path)s",
                 "--certificate-path=tests/certs",
+                "--autorun",
+                "--close-when-done",
                 "--console-level=INFO",
                 "--testing-modules-dir=tests/modules",
                 "--quiet"
             ],
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
         "xpcshell": {
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -328,16 +328,20 @@ class MochitestRunner(MozbuildObject):
             if not options.app or options.app == self.get_binary_path():
                 options.app = self.get_webapp_runtime_path()
             options.xrePath = self.get_webapp_runtime_xre_path()
         elif suite == 'webapprt-chrome':
             options.browserArgs.append("-test-mode")
             if not options.app or options.app == self.get_binary_path():
                 options.app = self.get_webapp_runtime_path()
             options.xrePath = self.get_webapp_runtime_xre_path()
+            # On Mac, pass the path to the runtime, to ensure the test app
+            # uses that specific runtime instead of another one on the system.
+            if sys.platform.startswith('darwin'):
+                options.browserArgs.extend(('-runtime', os.path.join(self.distdir, self.substs['MOZ_MACBUNDLE_NAME'])))
 
         from manifestparser import TestManifest
         manifest = TestManifest()
         manifest.tests.extend(tests)
         options.manifestFile = manifest
 
         # XXX why is this such a special case?
         if len(tests) == 1 and options.closeWhenDone and suite == 'plain':
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2218,21 +2218,16 @@ class Mochitest(MochitestUtilsMixin):
                     count += 1
                 if count == 0:
                     return 1
 
             self.buildURLOptions(options, self.browserEnv)
             if self.urlOpts:
                 testURL += "?" + "&".join(self.urlOpts)
 
-            # On Mac, pass the path to the runtime, to ensure the test app
-            # uses that specific runtime instead of another one on the system.
-            if mozinfo.isMac and options.webapprtChrome:
-                options.browserArgs.extend(('-runtime', os.path.dirname(os.path.dirname(options.xrePath))))
-
             if options.webapprtContent:
                 options.browserArgs.extend(('-test-mode', testURL))
                 testURL = None
 
             if options.immersiveMode:
                 options.browserArgs.extend(('-firefoxpath', options.app))
                 options.app = self.immersiveHelperPath
 
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
 {
-    "repo": "https://hg.mozilla.org/users/myk_mozilla.com/mozharness",
-    "revision": "default"
+    "repo": "https://hg.mozilla.org/build/mozharness",
+    "revision": "4a31e6739409"
 }