From a7579e7241ad2092826e28a3e5fd171addaf437b Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Wed, 9 Aug 2017 08:31:26 +1000 Subject: [PATCH] Bug 1383992 part 2 - Enable some more mochitests for stylo. r=jmaher MozReview-Commit-ID: AnZAxhPwwEB --HG-- extra : rebase_source : 89418b819a53f1d1e5a5cd2861f31af1ff901844 extra : source : 1bc1f2000c0a4e9e23f5e2f05b7d95e44c615238 extra : histedit_source : ad7d9650d49c698d03d6397aa1ad27e860ae7827 --- layout/style/test/moz.build | 11 --- layout/style/test/stylo-failures.md | 51 ----------- taskcluster/ci/test/test-sets.yml | 11 ++- taskcluster/ci/test/tests.yml | 84 +++++++------------ .../configs/unittests/linux_unittest.py | 2 - .../configs/unittests/mac_unittest.py | 2 - .../unittests/win_taskcluster_unittest.py | 2 - 7 files changed, 40 insertions(+), 123 deletions(-) delete mode 100644 layout/style/test/stylo-failures.md diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build index 3f160b4cd5dc..fa646ca16dd3 100644 --- a/layout/style/test/moz.build +++ b/layout/style/test/moz.build @@ -123,17 +123,6 @@ TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test['css-visited'] += [ '/layout/reftests/svg/pseudo-classes-02.svg', ] -if CONFIG['MOZ_STYLO']: - TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test += [ - 'stylo-failures.md', - ] - TEST_HARNESS_FILES.testing.mochitest.chrome.layout.style.test += [ - 'stylo-failures.md', - ] - # TEST_HARNESS_FILES.testing.mochitest.browser.layout.style.test += [ - # 'stylo-failures.md', - # ] - DEFINES['MOZILLA_INTERNAL_API'] = True if CONFIG['MOZ_ENABLE_MASK_AS_SHORTHAND']: HOST_DEFINES['MOZ_ENABLE_MASK_AS_SHORTHAND'] = True diff --git a/layout/style/test/stylo-failures.md b/layout/style/test/stylo-failures.md deleted file mode 100644 index a6d1a3d5dbf7..000000000000 --- a/layout/style/test/stylo-failures.md +++ /dev/null @@ -1,51 +0,0 @@ -This file describes test failures we currently have for stylo. - -Failure patterns are described in the following format: -* test_name.html [number] -* test_name.html `pattern` [number] -* test_name.html: description [number] -* test_name.html `pattern`: description [number] -* test_name.html asserts [number] -* test_name.html asserts: description [number] - -In which -* test_name.html is the name of the test. It could be "..." which means - the same name as the previous failure pattern. -* description is a comment for the supposed reason of the failure. -* [number] is the expected count of the failure, which can be a "*" meaning - any positive number. -* `pattern` is a substring of the failure message. If there are multiple items - for the same test file, a failure is captured by the first matched pattern. - For example, if there is a failure with message "foo bar", and there is a - pattern `foo` followed by a pattern `bar`, this failure would be counted in - the pattern `foo`. -* "asserts" means it is for assertion. Number of assertions of a same test is - accumulated, unlike `pattern`. And number of assertions cannot be "*". - -Any line which doesn't follow the format above would be ignored like comment. - -To use this file, you need to add `--failure-pattern-file=stylo-failures.md` -to mochitest command. - -## Failures - -* Media query support: - * test_media_queries_dynamic_xbl.html: xbl support bug 1382078 [1] -* Animation support: - * SMIL Animation - * test_restyles_in_smil_animation.html [2] -* Incorrect serialization - * place-{content,items,self} shorthands bug 1363971 - * test_align_shorthand_serialization.html [6] -* Unit should be preserved after parsing servo/servo#15346 -* test_author_specified_style.html: support serializing color as author specified bug 1348165 [27] -* browser_newtab_share_rule_processors.js: agent style sheet sharing [1] -* test_selectors_on_anonymous_content.html: xbl and :nth-child bug 1382102 [1] - -## Assertions - -## Need Gecko change - -## Unknown / Unsure - -## Ignore diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml index b182d132ceff..43cc7845e54d 100644 --- a/taskcluster/ci/test/test-sets.yml +++ b/taskcluster/ci/test/test-sets.yml @@ -84,15 +84,20 @@ stylo-tests: - crashtest - reftest - reftest-stylo - - mochitest-style - - mochitest-chrome-style - web-platform-tests - web-platform-tests-reftests + - mochitest + - mochitest-browser-screenshots + - mochitest-chrome + - mochitest-clipboard + - mochitest-gpu + - mochitest-media + - mochitest-webgl stylo-sequential-tests: - crashtest - reftest-stylo - - mochitest-style + - mochitest qr-tests: - cppunit diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml index 478eeb7501e4..e702b420db50 100644 --- a/taskcluster/ci/test/tests.yml +++ b/taskcluster/ci/test/tests.yml @@ -445,7 +445,14 @@ mochitest: allow-software-gl-layers: false run-on-projects: by-test-platform: + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] + windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try'] default: built-projects + tier: + by-test-platform: + macosx64-stylo/.*: 2 + default: default mozharness: by-test-platform: android.*: @@ -620,6 +627,9 @@ mochitest-chrome: run-on-projects: by-test-platform: windows7-32.*: ['try'] + linux64-stylo/debug: ['try'] + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] default: built-projects worker-type: by-test-platform: @@ -660,34 +670,10 @@ mochitest-chrome: tier: by-test-platform: windows7-32.*: 2 + macosx64-stylo/.*: 2 + linux64-stylo/debug: 3 default: default -mochitest-chrome-style: - description: "Mochitest chrome run for style system" - suite: mochitest/chrome-style - treeherder-symbol: tc-M(cs) - loopback-video: true - run-on-projects: - by-test-platform: - .*-stylo.*: ['autoland', 'mozilla-central', 'try'] - default: built-projects - e10s: false - mozharness: - mochitest-flavor: chrome - script: desktop_unittest.py - no-read-buildbot-config: true - config: - by-test-platform: - windows.*: - - unittests/win_taskcluster_unittest.py - macosx.*: - - unittests/mac_unittest.py - default: - - unittests/linux_unittest.py - - remove_executables.py - extra-options: - - --mochitest-suite=chrome-style - mochitest-clipboard: description: "Mochitest clipboard run" suite: mochitest/clipboard @@ -695,6 +681,9 @@ mochitest-clipboard: loopback-video: true virtualization: hardware instance-size: xlarge + linux64-stylo/debug: ['try'] + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] worker-type: by-test-platform: windows7-32.*: buildbot-bridge/buildbot-bridge @@ -728,6 +717,8 @@ mochitest-clipboard: - remove_executables.py extra-options: - --mochitest-suite=plain-clipboard,chrome-clipboard,browser-chrome-clipboard + macosx64-stylo/.*: 2 + linux64-stylo/debug: 3 mochitest-devtools-chrome: description: "Mochitest devtools-chrome run" @@ -749,7 +740,9 @@ mochitest-devtools-chrome: windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland'] windows8-64-devedition/opt: built-projects # No dev edition outside of supported branches windows10.*: [] - .*-stylo.*: ['autoland', 'mozilla-central', 'try'] + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] + windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try'] default: built-projects worker-type: by-test-platform: @@ -799,6 +792,9 @@ mochitest-gpu: windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland'] windows8-64-devedition/opt: built-projects # No dev edition outside of supported branches windows10.*: [] + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] + windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try'] default: built-projects worker-type: by-test-platform: @@ -834,6 +830,7 @@ mochitest-gpu: tier: by-test-platform: linux64-qr/.*: 1 + macosx64-stylo/.*: 2 default: default mochitest-jetpack: @@ -883,6 +880,9 @@ mochitest-media: windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland'] windows8-64-devedition/opt: built-projects # No dev edition outside of supported branches windows10.*: [] + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] + windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try'] default: built-projects worker-type: by-test-platform: @@ -921,33 +921,9 @@ mochitest-media: tier: by-test-platform: linux64-qr/.*: 1 + macosx64-stylo/.*: 2 default: default -mochitest-style: - description: "Mochitest plain run for style system" - suite: mochitest/plain-style - treeherder-symbol: tc-M(s) - loopback-video: true - run-on-projects: - by-test-platform: - .*-stylo.*: ['autoland', 'mozilla-central', 'try'] - default: built-projects - mozharness: - mochitest-flavor: plain - script: desktop_unittest.py - no-read-buildbot-config: true - config: - by-test-platform: - windows.*: - - unittests/win_taskcluster_unittest.py - macosx.*: - - unittests/mac_unittest.py - default: - - unittests/linux_unittest.py - - remove_executables.py - extra-options: - - --mochitest-suite=plain-style - mochitest-valgrind: description: "Mochitest plain Valgrind run" suite: mochitest/valgrind-plain @@ -988,6 +964,9 @@ mochitest-webgl: windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland'] windows8-64-devedition/opt: built-projects # No dev edition outside of supported branches windows10.*: [] + linux64-stylo.*: ['autoland', 'mozilla-central', 'try'] + macosx64-stylo/.*: ['mozilla-central', 'try'] + windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try'] default: built-projects worker-type: by-test-platform: @@ -1038,6 +1017,7 @@ mochitest-webgl: tier: by-test-platform: linux64-qr/.*: 1 + macosx64-stylo/.*: 2 default: default reftest: diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index eeee3d279d60..ecc5c884fb68 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -207,8 +207,6 @@ config = { "jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"], "jetpack-addon": ["--flavor=jetpack-addon"], "a11y": ["--flavor=a11y"], - "plain-style": ["--failure-pattern-file=stylo-failures.md", "layout/style/test", "dom/smil/test", "dom/animation/test"], - "chrome-style": ["--flavor=chrome", "--failure-pattern-file=../stylo-failures.md", "layout/style/test/chrome", "dom/animation/test"], }, # local reftest suites "all_reftest_suites": { diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py index 1b3bcbaf10a4..2b45baac3ef7 100644 --- a/testing/mozharness/configs/unittests/mac_unittest.py +++ b/testing/mozharness/configs/unittests/mac_unittest.py @@ -170,8 +170,6 @@ config = { "jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"], "jetpack-addon": ["--flavor=jetpack-addon"], "a11y": ["--flavor=a11y"], - "plain-style": ["--failure-pattern-file=stylo-failures.md", "layout/style/test", "dom/smil/test", "dom/animation/test"], - "chrome-style": ["--flavor=chrome", "--failure-pattern-file=../stylo-failures.md", "layout/style/test/chrome", "dom/animation/test"], }, # local reftest suites "all_reftest_suites": { diff --git a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py index e123d08db49e..2eb6b78d6d04 100644 --- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py +++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py @@ -182,8 +182,6 @@ config = { "jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"], "jetpack-addon": ["--flavor=jetpack-addon"], "a11y": ["--flavor=a11y"], - "plain-style": ["--failure-pattern-file=stylo-failures.md", "layout/style/test", "dom/smil/test", "dom/animation/test"], - "chrome-style": ["--flavor=chrome", "--failure-pattern-file=../stylo-failures.md", "layout/style/test/chrome", "dom/animation/test"], }, # local reftest suites "all_reftest_suites": {