From b3e8f1b5587c159de40abfd2679d2dce0cface45 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Fri, 10 Mar 2017 12:38:38 +1100 Subject: [PATCH] Bug 1346047 - Enable chrome style system mochitests and run style system mochitests on e10s. r=jmaher MozReview-Commit-ID: 9Vj3mZL3IhJ --HG-- extra : rebase_source : aaf926fa895c4d42da5b89ea7650a99f6967fec2 --- layout/style/test/browser.ini | 1 - layout/style/test/chrome/chrome.ini | 1 - layout/style/test/moz.build | 6 ++++ layout/style/test/stylo-failures.md | 6 ++++ taskcluster/ci/test/test-sets.yml | 1 + taskcluster/ci/test/tests.yml | 28 +++++++++++++++++-- .../configs/unittests/linux_unittest.py | 3 +- 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/layout/style/test/browser.ini b/layout/style/test/browser.ini index 3b7aed2c81f8..4e5e47aac408 100644 --- a/layout/style/test/browser.ini +++ b/layout/style/test/browser.ini @@ -6,4 +6,3 @@ support-files = [browser_bug453896.js] [browser_newtab_share_rule_processors.js] -skip-if = stylo # bug 1290224 diff --git a/layout/style/test/chrome/chrome.ini b/layout/style/test/chrome/chrome.ini index a0fe97cf9a5b..86cef5435f55 100644 --- a/layout/style/test/chrome/chrome.ini +++ b/layout/style/test/chrome/chrome.ini @@ -20,4 +20,3 @@ tags = fullscreen tags = fullscreen [test_hover.html] [test_moz_document_rules.html] -skip-if = stylo # bug 1290224 diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build index 8d174ca2c28a..d8bc11263edf 100644 --- a/layout/style/test/moz.build +++ b/layout/style/test/moz.build @@ -119,6 +119,12 @@ 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']: diff --git a/layout/style/test/stylo-failures.md b/layout/style/test/stylo-failures.md index 336f43802f72..577e09472a48 100644 --- a/layout/style/test/stylo-failures.md +++ b/layout/style/test/stylo-failures.md @@ -35,6 +35,9 @@ Any line which doesn't follow the format above would be ignored like comment. * test_media_queries_dynamic.html [17] * test_media_queries_dynamic_xbl.html [2] * test_webkit_device_pixel_ratio.html: -webkit-device-pixel-ratio [3] + * browser_bug453896.js [8] + * test_display_mode.html [7] + * test_display_mode_reflow.html [2] * test_all_shorthand.html: all shorthand servo/servo#15055 [*] * Animation support: * test_animations.html [70] @@ -476,10 +479,13 @@ Any line which doesn't follow the format above would be ignored like comment. * test_rule_insertion.html [16] * @-moz-document support * test_rule_serialization.html [2] + * test_moz_document_rules.html [13] * getComputedStyle style doesn't contain custom properties bug 1336891 * test_variable_serialization_computed.html [36] * test_variables.html `custom property name` [2] * test_css_supports.html: issues around @supports syntax servo/servo#15482 [8] +* test_author_specified_style.html: support serializing color as author specified [33] +* browser_newtab_share_rule_processors.js: agent style sheet sharing [1] ## Assertions diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml index a806e0f939bc..b1b3489d5656 100644 --- a/taskcluster/ci/test/test-sets.yml +++ b/taskcluster/ci/test/test-sets.yml @@ -73,6 +73,7 @@ stylo-tests: - crashtest - reftest-stylo - mochitest-style + - mochitest-chrome-style qr-tests: - cppunit diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml index d4dc581de078..ae7814283212 100644 --- a/taskcluster/ci/test/tests.yml +++ b/taskcluster/ci/test/tests.yml @@ -911,10 +911,10 @@ mochitest-webgl: mochitest-style: description: "Mochitest plain run for style system" - suite: mochitest/mochitest-style + suite: mochitest/plain-style treeherder-symbol: tc-M(s) loopback-video: true - e10s: false + e10s: both run-on-projects: by-test-platform: linux64-stylo/.*: [ 'stylo', 'autoland', 'mozilla-inbound', 'mozilla-central', 'try' ] @@ -929,7 +929,29 @@ mochitest-style: - unittests/linux_unittest.py - remove_executables.py extra-options: - - --mochitest-suite=mochitest-style + - --mochitest-suite=plain-style + +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: + linux64-stylo/.*: [ 'stylo', 'autoland', 'mozilla-inbound', 'mozilla-central', 'try' ] + default: ['all'] + e10s: false + mozharness: + mochitest-flavor: chrome + script: desktop_unittest.py + no-read-buildbot-config: true + config: + by-test-platform: + default: + - unittests/linux_unittest.py + - remove_executables.py + extra-options: + - --mochitest-suite=chrome-style reftest: description: "Reftest run" diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index ff938c7b5656..f151972c3739 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -204,7 +204,8 @@ config = { "jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"], "jetpack-addon": ["--flavor=jetpack-addon"], "a11y": ["--flavor=a11y"], - "mochitest-style": ["--disable-e10s", "--failure-pattern-file=stylo-failures.md", "layout/style/test"], + "plain-style": ["--failure-pattern-file=stylo-failures.md", "layout/style/test"], + "chrome-style": ["--flavor=chrome", "--failure-pattern-file=../stylo-failures.md", "layout/style/test/chrome"], }, # local reftest suites "all_reftest_suites": {