diff --git a/layout/reftests/reftest-qr.list b/layout/reftests/reftest-qr.list new file mode 100644 index 0000000000000..4859fdbc3999e --- /dev/null +++ b/layout/reftests/reftest-qr.list @@ -0,0 +1,26 @@ +# tests that are more likely to be affected by WebRender changes +# as per bug 1621095 this is created to reduce load on android phones + +# gfx +include ../../gfx/tests/reftest/reftest.list + +include async-scrolling/reftest.list + +# bugs/ +include bugs/reftest.list + +# css animations +include css-animations/reftest.list + +# invalidation +include invalidation/reftest.list + +# sticky positioning +include position-sticky/reftest.list + +# svg/ +include svg/reftest.list + +# 3d transforms +include transform-3d/reftest.list + diff --git a/moz.build b/moz.build index 058ada03d1a8d..45e499073f33f 100644 --- a/moz.build +++ b/moz.build @@ -78,6 +78,10 @@ with Files("**/reftest.list"): SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu'] SCHEDULES.exclusive = ['reftest'] +with Files("**/reftest-qr.list"): + SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu'] + SCHEDULES.exclusive = ['reftest'] + with Files("**/crashtest*.list"): SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu'] SCHEDULES.exclusive = ['crashtest'] diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py index ab4e393a75184..76ba2faa3f841 100644 --- a/python/mozbuild/mozbuild/action/test_archive.py +++ b/python/mozbuild/mozbuild/action/test_archive.py @@ -461,6 +461,7 @@ 'base': '', 'manifests': [ 'layout/reftests/reftest.list', + 'layout/reftests/reftest-qr.list', 'testing/crashtest/crashtests.list', ], 'dest': 'reftest/tests', diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml index 5a4b386a2d17f..6b2538a8f122f 100644 --- a/taskcluster/ci/test/reftest.yml +++ b/taskcluster/ci/test/reftest.yml @@ -146,6 +146,18 @@ reftest: linux1804-64-qr/debug: ['trunk'] default: [] +reftest-qr: + description: "Reftest webrender run" + treeherder-symbol: R(R) + chunks: 2 + e10s: true + run-on-projects: built-projects + max-run-time: 2400 + mozharness: + chunked: true + tier: 2 + + reftest-gpu: description: "Reftest GPU run" treeherder-symbol: R(Rg) diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml index c08841caf0a5c..84f6ab7d3ba28 100644 --- a/taskcluster/ci/test/test-sets.yml +++ b/taskcluster/ci/test/test-sets.yml @@ -604,7 +604,7 @@ android-hw-aarch64-debug-unittests: android-hw-aarch64-qr: - crashtest - - reftest + - reftest-qr android-hw-arm7-raptor: - raptor-speedometer-geckoview diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index 2a424c578d722..0cda53bd9fa11 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -1280,6 +1280,7 @@ def split_e10s(config, tests): 'mochitest-webgl2-ext', 'raptor', 'reftest', + 'reftest-qr', 'reftest-gpu', 'reftest-no-accel', 'talos', diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py index 643a277ba413a..d4442bfaf72f2 100644 --- a/testing/mozbase/moztest/moztest/resolve.py +++ b/testing/mozbase/moztest/moztest/resolve.py @@ -189,6 +189,14 @@ def WebglSuite(name): 'task_regex': ['(opt|debug)-reftest($|.*(-1|[^0-9])$)', 'test-verify-gpu($|.*(-1|[^0-9])$)'], }, + 'reftest-qr': { + 'aliases': ('rr',), + 'build_flavor': 'reftest', + 'mach_command': 'reftest', + 'kwargs': {'tests': None}, + 'task_regex': ['(opt|debug)-reftest-qr($|.*(-1|[^0-9])$)', + 'test-verify-gpu($|.*(-1|[^0-9])$)'], + }, 'robocop': { 'mach_command': 'robocop', 'kwargs': {'test_paths': None}, diff --git a/testing/mozharness/configs/android/android_common.py b/testing/mozharness/configs/android/android_common.py index 5e034bce9c65b..b70f692be096d 100644 --- a/testing/mozharness/configs/android/android_common.py +++ b/testing/mozharness/configs/android/android_common.py @@ -159,6 +159,31 @@ def WebglSuite(name): ], "tests": ["tests/layout/reftests/reftest.list",], }, + "reftest-qr": { + "run_filename": "remotereftest.py", + "testsdir": "reftest", + "options": [ + "--app=%(app)s", + "--ignore-window-size", + "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", + "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", + "--httpd-path", "%(modules_dir)s", + "--symbols-path=%(symbols_path)s", + "--extra-profile-file=fonts", + "--extra-profile-file=hyphenation", + "--suite=reftest", + "--log-raw=%(raw_log_file)s", + "--log-raw-level=%(log_raw_level)s", + "--log-errorsummary=%(error_summary_file)s", + "--log-tbpl-level=%(log_tbpl_level)s", + "--deviceSerial=%(device_serial)s", + "--topsrcdir=tests", + ], + "tests": ["tests/layout/reftests/reftest-qr.list",], + }, "crashtest": { "run_filename": "remotereftest.py", "testsdir": "reftest", diff --git a/testing/mozharness/mozharness/mozilla/testing/errors.py b/testing/mozharness/mozharness/mozilla/testing/errors.py index 0cccb58340945..e6688d31ec0aa 100644 --- a/testing/mozharness/mozharness/mozilla/testing/errors.py +++ b/testing/mozharness/mozharness/mozilla/testing/errors.py @@ -25,6 +25,13 @@ 'known_fail_group': "Todo", } +_reftest_summary = { + 'regex': re.compile(r'''REFTEST INFO \| (Successful|Unexpected|Known problems): (\d+) \('''), # NOQA: E501 + 'pass_group': "Successful", + 'fail_group': "Unexpected", + 'known_fail_group': "Known problems", +} + TinderBoxPrintRe = { "mochitest-chrome_summary": _mochitest_summary, "mochitest-webgl1-core_summary": _mochitest_summary, @@ -42,30 +49,16 @@ 'fail_group': "failed", 'known_fail_group': "todo", }, - "reftest_summary": { - 'regex': re.compile(r'''REFTEST INFO \| (Successful|Unexpected|Known problems): (\d+) \('''), # NOQA: E501 - 'pass_group': "Successful", - 'fail_group': "Unexpected", - 'known_fail_group': "Known problems", - }, - "crashtest_summary": { - 'regex': re.compile(r'''REFTEST INFO \| (Successful|Unexpected|Known problems): (\d+) \('''), # NOQA: E501 - 'pass_group': "Successful", - 'fail_group': "Unexpected", - 'known_fail_group': "Known problems", - }, + "reftest_summary": _reftest_summary, + "reftest-qr_summary": _reftest_summary, + "crashtest_summary": _reftest_summary, "xpcshell_summary": { 'regex': re.compile(r'''INFO \| (Passed|Failed|Todo): (\d+)'''), 'pass_group': "Passed", 'fail_group': "Failed", 'known_fail_group': "Todo", }, - "jsreftest_summary": { - 'regex': re.compile(r'''REFTEST INFO \| (Successful|Unexpected|Known problems): (\d+) \('''), # NOQA: E501 - 'pass_group': "Successful", - 'fail_group': "Unexpected", - 'known_fail_group': "Known problems", - }, + "jsreftest_summary": _reftest_summary, "instrumentation_summary": _mochitest_summary, "cppunittest_summary": { 'regex': re.compile(r'''cppunittests INFO \| (Passed|Failed): (\d+)'''), diff --git a/testing/mozharness/mozharness/mozilla/testing/testbase.py b/testing/mozharness/mozharness/mozilla/testing/testbase.py index ecd20585a2bf1..0cdda05bb4cbc 100755 --- a/testing/mozharness/mozharness/mozilla/testing/testbase.py +++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py @@ -320,6 +320,7 @@ def _download_test_packages(self, suite_categories, extract_dirs): 'mochitest-webgpu': 'mochitest', 'geckoview': 'mochitest', 'geckoview-junit': 'mochitest', + 'reftest-qr': 'reftest', 'jsreftest': 'reftest', 'crashtest': 'reftest', 'reftest-debug': 'reftest', diff --git a/tools/tryselect/test/test_mozharness_integration.py b/tools/tryselect/test/test_mozharness_integration.py index 75583dd6c6397..0cd01dbd1820b 100644 --- a/tools/tryselect/test/test_mozharness_integration.py +++ b/tools/tryselect/test/test_mozharness_integration.py @@ -25,6 +25,7 @@ 'geckoview-junit', 'jittest', 'jsreftest', + 'reftest-qr', ], }, 'desktop_unittest': { @@ -45,7 +46,6 @@ 'mochitest-valgrind-plain', 'reftest-gpu', 'reftest-no-accel', - 'reftest-qr', ], }, }