Bug 1341078 - Run CSS tests on Linux, r=ahal
These are initially run on Linux only for capacity reasons.
MozReview-Commit-ID: Ge4nu1NGDdr
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -159,16 +159,19 @@ class WebPlatformTest(TestingMixin, Merc
"--log-errorsummary=%s" % os.path.join(dirs["abs_blob_upload_dir"],
"wpt_errorsummary.log"),
"--binary=%s" % self.binary_path,
"--symbols-path=%s" % self.query_symbols_url(),
"--stackwalk-binary=%s" % self.query_minidump_stackwalk(),
"--stackfix-dir=%s" % os.path.join(dirs["abs_test_install_dir"], "bin"),
"--run-by-dir=3"]
+ if not sys.platform.startswith("linux"):
+ cmd += ["--exclude=css"]
+
# Let wptrunner determine the test type when --try-test-paths is used
wpt_test_paths = self.try_test_paths.get("web-platform-tests")
if not wpt_test_paths:
for test_type in c.get("test_type", []):
cmd.append("--test-type=%s" % test_type)
if not c["e10s"]:
cmd.append("--disable-e10s")
--- a/testing/web-platform/mach_commands.py
+++ b/testing/web-platform/mach_commands.py
@@ -46,16 +46,19 @@ class WebPlatformTestsRunnerSetup(Mozbui
kwargs["certutil_binary"] = self.get_binary_path('certutil')
if kwargs["stackfix_dir"] is None:
kwargs["stackfix_dir"] = os.path.split(
self.get_binary_path(validate_exists=False))[0]
here = os.path.split(__file__)[0]
+ if kwargs["exclude"] is None and kwargs["include"] is None and not sys.platform.startswith("linux"):
+ kwargs["exclude"] = ["css"]
+
if kwargs["ssl_type"] in (None, "pregenerated"):
if kwargs["ca_cert_path"] is None:
kwargs["ca_cert_path"] = os.path.join(here, "certs", "cacert.pem")
if kwargs["host_key_path"] is None:
kwargs["host_key_path"] = os.path.join(here, "certs", "web-platform.test.key")
if kwargs["host_cert_path"] is None:
@@ -133,21 +136,16 @@ class WebPlatformTestsUpdater(MozbuildOb
import update
from update import updatecommandline
if kwargs["config"] is None:
kwargs["config"] = os.path.join(self.topsrcdir, 'testing', 'web-platform', 'wptrunner.ini')
if kwargs["product"] is None:
kwargs["product"] = "firefox"
- if kwargs["sync"]:
- if not kwargs["exclude"]:
- kwargs["exclude"] = ["css/*"]
- if not kwargs["include"]:
- kwargs["include"] = ["css/css-timing-1/*", "css/css-animations-1/*", "css/css-transitions-1/*"]
kwargs = updatecommandline.check_args(kwargs)
logger = update.setup_logging(kwargs, {"mach": sys.stdout})
try:
update.run_update(logger, **kwargs)
except Exception:
--- a/testing/web-platform/mach_test_package_commands.py
+++ b/testing/web-platform/mach_test_package_commands.py
@@ -35,16 +35,19 @@ class WebPlatformTestsRunnerSetup(object
if kwargs["ca_cert_path"] is None:
kwargs["ca_cert_path"] = os.path.join(self.context.package_root, "web-platform", "certs", "cacert.pem")
if kwargs["host_key_path"] is None:
kwargs["host_key_path"] = os.path.join(self.context.package_root, "web-platform", "certs", "web-platform.test.key")
if kwargs["host_cert_path"] is None:
kwargs["host_cert_path"] = os.path.join(self.context.package_root, "web-platform", "certs", "web-platform.test.pem")
kwargs["capture_stdio"] = True
+ if kwargs["exclude"] is None and kwargs["include"] is None and not sys.platform.startswith("linux"):
+ kwargs["exclude"] = ["css"]
+
if kwargs["webdriver_binary"] is None:
kwargs["webdriver_binary"] = os.path.join(self.context.bin_dir, "geckodriver")
kwargs = wptcommandline.check_args(kwargs)
def kwargs_wptrun(self, kwargs):
raise NotImplementedError