From 2ade9fa1fd9ea35b7075301d9180fd3ef5a0eef2 Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 23 Jun 2020 10:00:28 +0000 Subject: [PATCH] Bug 1644395 - Add wpt print reftests to TC config, r=ahal Differential Revision: https://phabricator.services.mozilla.com/D79082 --- python/mozbuild/mozbuild/schedules.py | 1 + taskcluster/ci/test/test-sets.yml | 2 ++ taskcluster/ci/test/web-platform.yml | 11 +++++++++++ taskcluster/taskgraph/transforms/tests.py | 1 + taskcluster/taskgraph/try_option_syntax.py | 1 + testing/mozbase/moztest/moztest/resolve.py | 7 +++++++ testing/mozharness/scripts/web_platform_tests.py | 1 + testing/testinfo.py | 1 + 8 files changed, 25 insertions(+) diff --git a/python/mozbuild/mozbuild/schedules.py b/python/mozbuild/mozbuild/schedules.py index 940e8caf85e4..d744570d40bf 100644 --- a/python/mozbuild/mozbuild/schedules.py +++ b/python/mozbuild/mozbuild/schedules.py @@ -66,6 +66,7 @@ EXCLUSIVE_COMPONENTS = [ 'mochitest-chrome', 'mochitest-plain', 'web-platform-tests-crashtest', + 'web-platform-tests-print-reftest', 'web-platform-tests-reftest', 'web-platform-tests-wdspec', # webrender enabled diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml index 1c154c98cf2e..7d4054e43cf8 100644 --- a/taskcluster/ci/test/test-sets.yml +++ b/taskcluster/ci/test/test-sets.yml @@ -18,6 +18,7 @@ web-platform-tests: - web-platform-tests - web-platform-tests-crashtest + - web-platform-tests-print-reftest - web-platform-tests-reftest - web-platform-tests-wdspec @@ -458,6 +459,7 @@ android-x86_64-tests: - web-platform-tests - web-platform-tests-backlog - web-platform-tests-crashtest + - web-platform-tests-print-reftest - web-platform-tests-reftest - web-platform-tests-reftest-backlog - xpcshell diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml index 717c3570b710..b29539f8e25a 100644 --- a/taskcluster/ci/test/web-platform.yml +++ b/taskcluster/ci/test/web-platform.yml @@ -287,6 +287,17 @@ web-platform-tests-crashtest: .*-qr/.*: 2 # can't be tier-1 if it's not running on integration branches default: default +web-platform-tests-print-reftest: + description: "Web platform print-reftest run" + schedules-component: web-platform-tests-print-reftest + treeherder-symbol: W(Wp) + chunks: 1 + tier: 2 + run-on-projects: built-projects + mozharness: + extra-options: + - --test-type=print-reftest + test-verify-wpt: description: "Extra verification of web-platform tests modified on this push" suite: diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index ea4c87f08f3f..9acae37cbfd1 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -264,6 +264,7 @@ CHUNK_SUITES_BLACKLIST = ( 'test-verify-wpt', 'web-platform-tests-backlog', 'web-platform-tests-crashtest', + 'web-platform-tests-print-reftest', 'web-platform-tests-reftest-backlog', 'web-platform-tests-wdspec', ) diff --git a/taskcluster/taskgraph/try_option_syntax.py b/taskcluster/taskgraph/try_option_syntax.py index de2d73df63aa..6d4eb64794b5 100644 --- a/taskcluster/taskgraph/try_option_syntax.py +++ b/taskcluster/taskgraph/try_option_syntax.py @@ -99,6 +99,7 @@ UNITTEST_ALIASES = { 'web-platform-tests': alias_prefix('web-platform-tests'), 'web-platform-tests-e10s': alias_prefix('web-platform-tests-e10s'), 'web-platform-tests-crashtests': alias_prefix('web-platform-tests-crashtest'), + 'web-platform-tests-print-reftest': alias_prefix('web-platform-tests-print-reftest'), 'web-platform-tests-reftests': alias_prefix('web-platform-tests-reftest'), 'web-platform-tests-reftests-e10s': alias_prefix('web-platform-tests-reftest-e10s'), 'web-platform-tests-wdspec': alias_prefix('web-platform-tests-wdspec'), diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py index d4adfa8a7c27..653d592c31c1 100644 --- a/testing/mozbase/moztest/moztest/resolve.py +++ b/testing/mozbase/moztest/moztest/resolve.py @@ -225,6 +225,13 @@ TEST_SUITES = { 'task_regex': ['web-platform-tests-crashtest($|.*(-1|[^0-9])$)', 'test-verify-wpt'], }, + 'web-platform-tests-print-reftest': { + 'aliases': ('wpt',), + 'mach_command': 'web-platform-tests', + 'kwargs': {'include': []}, + 'task_regex': ['web-platform-tests-print-reftest($|.*(-1|[^0-9])$)', + 'test-verify-wpt'], + }, 'web-platform-tests-reftest': { 'aliases': ('wpt',), 'mach_command': 'web-platform-tests', diff --git a/testing/mozharness/scripts/web_platform_tests.py b/testing/mozharness/scripts/web_platform_tests.py index b0ffc4c1a38a..2b9eb2f50f29 100755 --- a/testing/mozharness/scripts/web_platform_tests.py +++ b/testing/mozharness/scripts/web_platform_tests.py @@ -329,6 +329,7 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM test_type_suite = { "testharness": "web-platform-tests", "crashtest": "web-platform-tests-crashtest", + "print-reftest": "web-platform-tests-print-reftest", "reftest": "web-platform-tests-reftest", "wdspec": "web-platform-tests-wdspec", } diff --git a/testing/testinfo.py b/testing/testinfo.py index e5a7bec44632..3c1c6b2e691d 100644 --- a/testing/testinfo.py +++ b/testing/testinfo.py @@ -732,6 +732,7 @@ class TestInfoReport(TestInfo): {"not": {"regex": {"result.test": "[a-g].*"}}}]), "web-platform-tests-wdspec": (self.path_mod_wpt, [None]), "web-platform-tests-crashtest": (self.path_mod_wpt, [None]), + "web-platform-tests-print-reftest": (self.path_mod_wpt, [None]), "xpcshell": (self.path_mod_xpcshell, [None]), "mochitest-plain": (None, [None]), "mochitest-browser-chrome": (None, [None]),