Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 41 insertions, 46 deletions

diff --git a/testing/mozharness/configs/releases/bouncer_firefox_nightly.py b/testing/mozharness/configs/releases/bouncer_firefox_nightly.py
index 09d52fe4a3..1fdbb83f73 100644
--- a/testing/mozharness/configs/releases/bouncer_firefox_nightly.py
+++ b/testing/mozharness/configs/releases/bouncer_firefox_nightly.py
@@ -10,6 +10,7 @@ config = {
             "platforms": [
                 "linux",
                 "linux64",
+                "linux64-aarch64",
                 "osx",
                 "win",
                 "win64",
@@ -21,6 +22,7 @@ config = {
             "platforms": [
                 "linux",
                 "linux64",
+                "linux64-aarch64",
                 "osx",
                 "win",
                 "win64",
@@ -32,6 +34,7 @@ config = {
             "platforms": [
                 "linux",
                 "linux64",
+                "linux64-aarch64",
                 "osx",
                 "win",
                 "win64",
diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
index 801f57eb14..4a7ad62450 100644
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -202,27 +202,7 @@ config = {
             "tests": ["tests/jsreftest/tests/js/src/tests/jstests.list"],
         },
         "reftest": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=layers.acceleration.force-enabled=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
-        "reftest-no-accel": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=layers.acceleration.disabled=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
-        "reftest-snapshot": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=reftest.use-draw-snapshot=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
+            "options": ["--suite=reftest", "--topsrcdir=tests/reftest/tests"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
         },
     },
diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
index d34acbeca6..84de3f6062 100644
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -188,27 +188,14 @@ config = {
             "options": ["--suite=reftest", "--topsrcdir=tests/reftest/tests"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
         },
-        "reftest-no-accel": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=layers.acceleration.disabled=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
     },
     "all_xpcshell_suites": {
         "xpcshell": {
             "options": [
                 "--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
-            ],
-            "tests": [],
-        },
-        "xpcshell-msix": {
-            "options": [
-                "--app-binary=%(binary_path)s",
-                "--app-path=%(install_dir)s",
-                "--xre-path=%(install_dir)s",
+                "--msix-app-binary=%(binary_path)s",
+                "--msix-app-path=%(install_dir)s",
+                "--msix-xre-path=%(install_dir)s",
             ],
             "tests": [],
         },
diff --git a/testing/mozharness/mach_commands.py b/testing/mozharness/mach_commands.py
index 47b3ca4977..737d3e30b2 100644
--- a/testing/mozharness/mach_commands.py
+++ b/testing/mozharness/mach_commands.py
@@ -116,11 +116,6 @@ class MozharnessRunner(MozbuildObject):
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config + ["--reftest-suite", "reftest"],
             },
-            "reftest-no-accel": {
-                "script": "desktop_unittest.py",
-                "config": desktop_unittest_config
-                + ["--reftest-suite", "reftest-no-accel"],
-            },
             "cppunittest": {
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config
diff --git a/testing/mozharness/mozharness/mozilla/testing/raptor.py b/testing/mozharness/mozharness/mozilla/testing/raptor.py
index fcfd66b19f..94df82294d 100644
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -290,7 +290,7 @@ class Raptor(
                 ["--gecko-profile-interval"],
                 {
                     "dest": "gecko_profile_interval",
-                    "type": "int",
+                    "type": "float",
                     "help": "The interval between samples taken by the profiler (ms).",
                 },
             ],
diff --git a/testing/mozharness/mozharness/mozilla/testing/talos.py b/testing/mozharness/mozharness/mozilla/testing/talos.py
index 96215b6f79..b7058592d3 100755
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -188,7 +188,7 @@ class Talos(
                 ["--gecko-profile-interval"],
                 {
                     "dest": "gecko_profile_interval",
-                    "type": "int",
+                    "type": "float",
                     "help": "The interval between samples taken by the profiler (milliseconds)",
                 },
             ],
diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py
index e42f507ff9..a08da92f4d 100755
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -216,6 +216,15 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
                 },
             ],
             [
+                ["--variant"],
+                {
+                    "action": "store",
+                    "dest": "variant",
+                    "default": "",
+                    "help": "specify a variant if mozharness needs to setup paths",
+                },
+            ],
+            [
                 ["--gpu-required"],
                 {
                     "action": "store_true",
@@ -698,6 +707,9 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
             if c.get("threads"):
                 base_cmd.extend(["--threads", c["threads"]])
 
+            if c["variant"]:
+                base_cmd.append("--variant={}".format(c["variant"]))
+
             if c["enable_xorigin_tests"]:
                 base_cmd.append("--enable-xorigin-tests")
 
@@ -926,8 +938,17 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
 
             # All Linux systems need module-null-sink to be loaded, otherwise
             # media tests fail.
+
             self.run_command("pactl load-module module-null-sink")
-            self.run_command("pactl list modules short")
+            modules = self.get_output_from_command("pactl list modules short")
+            if not [l for l in modules.splitlines() if "module-x11" in l]:
+                # gnome-session isn't running, missing logind and other system services
+                # force the task to retry (return 4)
+                self.return_code = 4
+                self.fatal(
+                    "Unable to start PulseAudio and load x11 modules",
+                    exit_code=self.return_code,
+                )
 
     def stage_files(self):
         for category in SUITE_CATEGORIES:
diff --git a/testing/mozharness/scripts/web_platform_tests.py b/testing/mozharness/scripts/web_platform_tests.py
index 4ce679f62d..5af71ad7ad 100755
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -513,7 +513,16 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
         for tag in c["exclude_tag"]:
             cmd.append(f"--exclude-tag={tag}")
 
-        cmd.extend(test_paths)
+        if mozinfo.info["os"] == "win":
+            # Because of a limit on the length of CLI command line string length in Windows, we
+            # should prefer to pass paths by a file instead.
+            import tempfile
+
+            with tempfile.NamedTemporaryFile(delete=False) as tmp:
+                tmp.write("\n".join(test_paths).encode())
+                cmd.append(f"--include-file={tmp.name}")
+        else:
+            cmd.extend(test_paths)
 
         return cmd