Remove XP port from Blink LayoutTest related scripts.
Fixing up unit tests was somewhat complex due to XP being
used as a key test case throughout. We have essentially
updated the unit tests here to treat Win7 as the new XP,
and Win10 the way Win7 was previously.
Also remove dead ALL_BASELINE_VARIANTS constant and
accessor methods, and document the one remaining
(used by queries_unittest.py) for subsequent cleanup.
BUG=581240
Review URL: https://codereview.chromium.org/1624373005
Cr-Commit-Position: refs/heads/master@{#371701}
diff --git a/third_party/WebKit/LayoutTests/NeverFixTests b/third_party/WebKit/LayoutTests/NeverFixTests
index 214ece0b..dff4e8c 100644
--- a/third_party/WebKit/LayoutTests/NeverFixTests
+++ b/third_party/WebKit/LayoutTests/NeverFixTests
@@ -44,10 +44,6 @@
# <progress> on Mac is always animated. So it's hard to get a reliable pixel result.
[ Mac ] fast/dom/HTMLProgressElement/progress-element.html [ WontFix ]
-# This requires usp10.dll version 1.600 or greater on Windows and
-# it isn't installed on XP by default.
-[ XP ] css3/font-feature-settings-rendering.html [ WontFix ]
-
# These test the CoreAnimation plugin model which we never intend to support on
# Windows and Linux.
[ Win Linux ] compositing/plugins/1x1-composited-plugin.html [ WontFix ]
@@ -158,13 +154,12 @@
[ SnowLeopard Debug ] fast/text/trailing_whitespace_wrapping.html [ WontFix ]
-# Subpixel font scaling requires DirectWrite on windows (which isn't supported
-# on XP) and antialiasing on mac (which isn't enabled tests).
-[ XP Mac ] fast/text/sub-pixel/text-scaling-ltr.html [ WontFix ]
-[ XP Mac ] fast/text/sub-pixel/text-scaling-pixel.html [ WontFix ]
-[ XP Mac ] fast/text/sub-pixel/text-scaling-rtl.html [ WontFix ]
-[ XP Mac ] fast/text/sub-pixel/text-scaling-vertical.html [ WontFix ]
-[ XP Mac ] fast/text/sub-pixel/text-scaling-webfont.html [ WontFix ]
+# Subpixel font scaling requires antialiasing on mac (which isn't enabled tests).
+[ Mac ] fast/text/sub-pixel/text-scaling-ltr.html [ WontFix ]
+[ Mac ] fast/text/sub-pixel/text-scaling-pixel.html [ WontFix ]
+[ Mac ] fast/text/sub-pixel/text-scaling-rtl.html [ WontFix ]
+[ Mac ] fast/text/sub-pixel/text-scaling-vertical.html [ WontFix ]
+[ Mac ] fast/text/sub-pixel/text-scaling-webfont.html [ WontFix ]
[ Mac ] fast/text/mixed-direction-bidi-wrap.html [ WontFix ]
# Mac 10.6 only due to slight changes in text rendering
@@ -174,34 +169,6 @@
[ SnowLeopard Debug ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001k.html [ WontFix ]
[ SnowLeopard Debug ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001m.html [ WontFix ]
-# We don't have the necessary fonts for these tests on XP.
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001a.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001b.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001c.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001d.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001f.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001g.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001h.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001i.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001j.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001k.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001l.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001m.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001n.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-script-001o.html [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/vertical-alignment-vlr-023.xht [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/vertical-alignment-vlr-025.xht [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/vertical-alignment-vlr-027.xht [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/vertical-alignment-vrl-022.xht [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/vertical-alignment-vrl-024.xht [ WontFix ]
-[ XP ] imported/csswg-test/css-writing-modes-3/vertical-alignment-vrl-026.xht [ WontFix ]
-
-# Relies on precise timing which isn't reliable on XP.
-[ XP ] imported/web-platform-tests/user-timing/test_user_timing_mark.html [ WontFix ]
-
-# We don't have full plane2 support on XP.
-[ XP ] fast/text/international/plane2.html [ WontFix ]
-
# These two printing tests fail with the threaded compositor but they
# aren't critical to run in this mode.
virtual/threaded/printing/setPrinting.html [ WontFix ]
diff --git a/third_party/WebKit/LayoutTests/SlowTests b/third_party/WebKit/LayoutTests/SlowTests
index a09d05b..67d96de 100644
--- a/third_party/WebKit/LayoutTests/SlowTests
+++ b/third_party/WebKit/LayoutTests/SlowTests
@@ -72,12 +72,11 @@
crbug.com/451577 [ Debug ] fast/frames/calculate-round.html [ Slow ]
crbug.com/451577 imported/web-platform-tests/IndexedDB/idbindex-multientry-big.htm [ Slow ]
crbug.com/451577 [ Mac10.7 Mac10.8 ] inspector/elements/user-properties.html [ Slow ]
-crbug.com/451577 [ XP ] inspector/elements/user-properties.html [ Slow ]
-crbug.com/451577 [ Mac XP ] inspector/extensions/extensions-reload.html [ Slow ]
-crbug.com/451577 [ Mac XP ] inspector/extensions/extensions-resources.html [ Slow ]
-crbug.com/451577 [ Win10 XP ] inspector/extensions/extensions-sidebar.html [ Slow ]
-crbug.com/451577 [ Mac XP ] inspector/layers/layer-canvas-log.html [ Slow ]
-crbug.com/451577 [ Mac XP ] inspector/network/network-domain-filter.html [ Slow ]
+crbug.com/451577 [ Mac ] inspector/extensions/extensions-reload.html [ Slow ]
+crbug.com/451577 [ Mac ] inspector/extensions/extensions-resources.html [ Slow ]
+crbug.com/451577 [ Win10 ] inspector/extensions/extensions-sidebar.html [ Slow ]
+crbug.com/451577 [ Mac ] inspector/layers/layer-canvas-log.html [ Slow ]
+crbug.com/451577 [ Mac ] inspector/network/network-domain-filter.html [ Slow ]
crbug.com/474121 editing/deleting/password-delete-performance.html [ Slow ]
crbug.com/237245 [ Debug Win7 ] editing/selection/programmatic-selection-on-mac-is-directionless.html [ Slow ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 90b83417..ebd5dcf7 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -55,16 +55,6 @@
crbug.com/563265 editing/spelling/spellcheck-editable-on-focus-sync.html [ Skip ]
crbug.com/563265 editing/spelling/spelling-unified-emulation.html [ Skip ]
-crbug.com/231612 [ XP ] fast/parser/changing-attrbutes-crash.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/viewbox-syntax.svg [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/poly-parsing-error.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/polyline-invalid-points.svg [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/polyline-setattribute-points-null.svg [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/use-property-synchronization-crash.svg [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/dom/points-parser.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/hixie/error/010.xml [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/hixie/error/011.xml [ NeedsRebaseline ]
-
# TODO(wangxianzhu): Triage the failures
crbug.com/524134 virtual/spv2/paint/invalidation/invalidate-after-composited-scroll.html [ Failure ]
crbug.com/524134 crbug.com/539546 virtual/spv2/paint/selection/text-selection-drag.html [ Pass Failure ]
@@ -103,7 +93,7 @@
crbug.com/536138 virtual/spv2/paint/invalidation/repaint-subsequence-on-ancestor-clip-change.html [ Failure ]
-crbug.com/537172 [ Mac10.6 XP Win10 ] virtual/spv2/paint/invalidation/spv2/background-image-paint-invalidation.html [ Failure ]
+crbug.com/537172 [ Mac10.6 Win10 ] virtual/spv2/paint/invalidation/spv2/background-image-paint-invalidation.html [ Failure ]
crbug.com/564443 [ Mac10.7 Mac10.8 Mac10.9 Mac10.10 Win7 Linux ] virtual/spv2/paint/invalidation/spv2/background-image-paint-invalidation.html [ Failure Pass ]
crbug.com/504613 crbug.com/524248 paint/images/image-backgrounds-not-antialiased.html [ Skip ]
@@ -122,8 +112,8 @@
crbug.com/539226 [ Win ] http/tests/xmlhttprequest/open-in-body-onload-sync-to-invalid-preflight-handling.html [ Timeout Pass ]
crbug.com/417782 [ Linux Win ] virtual/rootlayerscrolls/fast/scrolling/fractional-scroll-offset-fixed-position-non-composited.html [ Failure ]
-crbug.com/492664 [ Linux XP ] imported/csswg-test/css-writing-modes-3/box-offsets-rel-pos-vlr-005.xht [ Failure ]
-crbug.com/492664 [ Linux XP ] imported/csswg-test/css-writing-modes-3/box-offsets-rel-pos-vrl-004.xht [ Failure ]
+crbug.com/492664 [ Linux ] imported/csswg-test/css-writing-modes-3/box-offsets-rel-pos-vlr-005.xht [ Failure ]
+crbug.com/492664 [ Linux ] imported/csswg-test/css-writing-modes-3/box-offsets-rel-pos-vrl-004.xht [ Failure ]
crbug.com/492664 [ Mac ] imported/csswg-test/css-writing-modes-3/bidi-embed-002.html [ Failure ]
crbug.com/492664 [ Mac ] imported/csswg-test/css-writing-modes-3/bidi-isolate-002.html [ Failure ]
crbug.com/492664 [ Win ] imported/csswg-test/css-writing-modes-3/bidi-override-005.html [ Failure ]
@@ -150,8 +140,6 @@
crbug.com/563650 inspector/elements/css-rule-hover-highlights-selectors.html [ Pass Failure ]
-crbug.com/568345 [ XP ] paint/invalidation/invalidate-box-shadow-currentColor.html [ NeedsRebaseline ]
-
crbug.com/522641 inspector/elements/styles-4/styles-update-links.html [ Pass Timeout ]
crbug.com/522645 [ Linux ] virtual/android/fullscreen/video-fixed-background.html [ Failure Pass ]
crbug.com/522647 http/tests/notifications/close-dispatch-asynchronous.html [ Failure Pass ]
@@ -189,7 +177,7 @@
crbug.com/520612 [ Linux ] fullscreen/anonymous-block-merge-crash.html [ Pass Timeout ]
crbug.com/520613 http/tests/cache/freshness-header.html [ Failure Pass ]
crbug.com/520614 http/tests/w3c/webperf/submission/Intel/resource-timing/test_resource_timing_buffer_size_restriction.html [ Failure Pass ]
-crbug.com/520619 [ Android Mac Linux XP Win7 ] webexposed/global-interface-listing.html [ Pass Timeout ]
+crbug.com/520619 [ Android Mac Linux Win7 ] webexposed/global-interface-listing.html [ Pass Timeout ]
crbug.com/520194 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-overridesexpires.html [ Failure Pass ]
crbug.com/520199 [ Mac ] plugins/plugin-initiate-popup-window.html [ Failure Pass ]
crbug.com/518967 [ Win7 ] http/tests/htmlimports/csp-import-block-but-nonce-nested.html [ Failure Pass Timeout ]
@@ -197,23 +185,6 @@
crbug.com/339597 http/tests/navigation/back-to-redirect-with-frame.php [ Pass Timeout ]
crbug.com/473718 http/tests/navigation/beacon-cross-origin-redirect.html [ Failure Pass ]
-crbug.com/231612 [ XP ] css3/filters/effect-reference-composite-hw.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] css3/filters/effect-reference-composite.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] fast/svg/whitespace-length.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/css/parse-length.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/disallow-non-lengths-in-attrs.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/invalid-length-units.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/invalid-lengthlist.svg [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/svg-length-rem-crash.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/svg-parse-overflow-1.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/svg-parse-overflow-2.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/svg-parse-overflow-3.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/svg-parse-overflow-4.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/custom/svg-parse-overflow-5.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/hixie/error/001.xml [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/parser/whitespace-length-invalid-1.html [ NeedsRebaseline ]
-crbug.com/231612 [ XP ] svg/parser/whitespace-length-invalid-2.html [ NeedsRebaseline ]
-
crbug.com/410974 fast/scroll-behavior/scroll-customization/scrollstate-basic.html [ Pass Failure ]
crbug.com/410974 fast/scroll-behavior/scroll-customization/scrollstate-consume-deltas.html [ Pass Failure ]
crbug.com/410974 fast/scroll-behavior/scroll-customization/scrollstate-consume-deltas-throw.html [ Pass Failure ]
@@ -226,8 +197,7 @@
crbug.com/410974 virtual/threaded/fast/scroll-behavior/scroll-customization/scrollstate-distribute-to-scroll-chain-descendant.html [ Pass Failure ]
crbug.com/410974 virtual/threaded/fast/scroll-behavior/scroll-customization/touch-scroll-customization.html [ Pass Failure ]
-crbug.com/580442 [ XP ] fast/js/mozilla/strict/15.4.5.1.html [ NeedsRebaseline ]
-crbug.com/518972 [ Linux XP ] http/tests/navigation/navigation-redirect-schedule-crash.html [ Failure Pass ]
+crbug.com/518972 [ Linux ] http/tests/navigation/navigation-redirect-schedule-crash.html [ Failure Pass ]
crbug.com/381730 http/tests/navigation/pending-location-change-assert.html [ Failure Pass ]
crbug.com/518974 http/tests/navigatorconnect/postmessage.html [ Failure Pass Timeout ]
crbug.com/518883 crbug.com/390452 http/tests/security/isolatedWorld/media-query-wrapper-leaks.html [ Failure Pass Timeout ]
@@ -321,15 +291,6 @@
crbug.com/569139 fast/js/string-replace-2.html [ NeedsManualRebaseline ]
crbug.com/569139 fast/js/regexp-caching.html [ NeedsManualRebaseline ]
-crbug.com/576589 [ XP ] editing/selection/select-across-readonly-input-3.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/forms/search/search-vertical-alignment.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/forms/text/textfield-overflow-by-value-update.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/forms/text/textfield-overflow.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/repaint/change-text-content-and-background-color.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/repaint/multi-layout-one-frame.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/repaint/subtree-root-skipped.html [ NeedsRebaseline ]
-crbug.com/576589 [ XP ] fast/text/international/mixed-directionality-selection.html [ NeedsRebaseline ]
-crbug.com/579381 [ XP ] fast/forms/text/input-placeholder-paint-order.html [ NeedsRebaseline ]
crbug.com/498539 http/tests/inspector/elements/styles/selector-line.html [ Pass Timeout ]
crbug.com/498539 http/tests/inspector/network/network-datareceived.html [ Pass Timeout ]
@@ -354,9 +315,8 @@
crbug.com/498539 [ Win7 ] inspector/sources/debugger-pause/debugger-eval-on-call-frame-inside-iframe.html [ Failure Pass ]
crbug.com/498539 [ Win7 ] inspector/sources/debugger-ui/source-frame-count.html [ Pass Timeout ]
crbug.com/498539 [ Win7 ] inspector/sources/debugger-ui/source-url-comment.html [ Pass Timeout ]
-crbug.com/498539 [ XP ] inspector/sources/debugger-ui/debugger-save-to-temp-var.html [ Pass Timeout ]
-crbug.com/498539 [ XP Trusty ] http/tests/inspector/sources/ui-source-code-highlight.php [ Crash Pass Timeout ]
-crbug.com/498539 [ XP Trusty ] inspector/sources/debugger-pause/pause-on-elements-panel.html [ Pass Timeout ]
+crbug.com/498539 [ Trusty ] http/tests/inspector/sources/ui-source-code-highlight.php [ Crash Pass Timeout ]
+crbug.com/498539 [ Trusty ] inspector/sources/debugger-pause/pause-on-elements-panel.html [ Pass Timeout ]
crbug.com/498539 [ Mac10.10 ] inspector/sources/debugger-ui/reveal-not-skipped.html [ Failure Pass ]
crbug.com/498539 [ Mac10.10 ] inspector/sources/debugger/rethrow-error-from-bindings-crash.html [ Failure Pass ]
crbug.com/498539 [ Linux32 ] inspector/console/console-log-linkify-stack-in-errors.html [ Failure Pass ]
@@ -402,7 +362,7 @@
crbug.com/552433 [ Linux Mac Win10 Win7 ] svg/transforms/text-with-pattern-with-svg-transform.svg [ Failure Pass ]
crbug.com/552433 [ Linux Mac Win10 Win7 ] svg/hixie/perf/006.xml [ Failure Pass ]
-crbug.com/441840 [ Mac XP ] cssom/ahem-ex-units.html [ Failure ]
+crbug.com/441840 [ Mac ] cssom/ahem-ex-units.html [ Failure ]
crbug.com/530044 transforms/2d/transform-borderbox.html [ NeedsManualRebaseline ]
@@ -419,16 +379,6 @@
crbug.com/240374 compositing/overlap-blending/children-opacity-huge.html [ Failure ]
crbug.com/240374 compositing/overlap-blending/children-opacity-no-overlap.html [ Failure ]
-crbug.com/579492 [ XP ] fast/forms/datetimelocal/datetimelocal-appearance-l10n.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] fast/forms/month/month-appearance-l10n.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] fast/ruby/nested-ruby.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] fast/text/international/002.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] fast/text/international/lang-glyph-cache-separation.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] fast/writing-mode/japanese-ruby-vertical-lr.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] fast/writing-mode/japanese-ruby-vertical-rl.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] inspector-protocol/layout-fonts/cjk-ideograph-fallback-by-lang.html [ NeedsRebaseline ]
-crbug.com/579492 [ XP ] inspector-protocol/layout-fonts/languages-emoji-rare-glyphs.html [ NeedsRebaseline ]
-
crbug.com/410145 [ Win ] fast/table/column-in-inline.html [ Failure ]
crbug.com/411164 [ Win ] http/tests/security/powerfulFeatureRestrictions/serviceworker-on-insecure-origin.html [ Pass ]
@@ -684,14 +634,6 @@
# Test sometimes flakes on most platforms
crbug.com/571531 imported/csswg-test/css-flexbox-1/css-flexbox-height-animation-stretch.html [ Pass Failure ]
-# failing on XP after https://codereview.chromium.org/1548053002
-crbug.com/492664 [ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-sideways-vrl-100.html [ Failure ]
-crbug.com/492664 [ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-mixed-vrl-100.html [ Failure ]
-crbug.com/492664 [ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-upright-vlr-100.html [ Failure ]
-crbug.com/492664 [ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-upright-vrl-100.html [ Failure ]
-crbug.com/492664 [ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-sideways-vlr-100.html [ Failure ]
-crbug.com/492664 [ XP ] imported/csswg-test/css-writing-modes-3/text-orientation-mixed-vlr-100.html [ Failure ]
-
# Either "combo" or split should run: http://testthewebforward.org/docs/css-naming.html
crbug.com/410320 imported/csswg-test/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001.html [ Skip ]
crbug.com/492664 imported/csswg-test/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001q.html [ Failure ]
@@ -798,9 +740,7 @@
crbug.com/377696 printing/width-overflow.html [ Skip ]
# Reftests that needs investigation.
-crbug.com/397232 [ XP ] css2.1/20110323/c541-word-sp-000.htm [ Failure ]
-crbug.com/397232 [ XP ] css2.1/20110323/vertical-align-boxes-001.htm [ Failure ]
-crbug.com/397255 [ Linux XP ] css3/masking/clip-path-reference-userSpaceOnUse.html [ Failure ]
+crbug.com/397255 [ Linux ] css3/masking/clip-path-reference-userSpaceOnUse.html [ Failure ]
crbug.com/475882 [ Mac Win ] fast/writing-mode/table-vertical-child-width.html [ Failure ]
crbug.com/396940 ietestcenter/css3/multicolumn/column-containing-block-001.htm [ Failure ]
crbug.com/396940 ietestcenter/css3/multicolumn/column-containing-block-002.htm [ Failure ]
@@ -812,16 +752,6 @@
crbug.com/378610 [ Win ] svg/custom/focus-ring-text.svg [ Failure ]
crbug.com/378610 [ Mac ] svg/custom/focus-ring-text.svg [ Failure Pass ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-0.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-1.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-2.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-3.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-4.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-5.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-6.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-7.html [ Failure ]
-crbug.com/523021 [ XP ] css3/fonts/font-style-matching-8.html [ Failure ]
-
crbug.com/474987 [ Win Mac ] css3/flexbox/auto-margins.html [ Failure ]
crbug.com/267206 [ Mac ] fast/scrolling/scrollbar-tickmarks-hittest.html [ Timeout ]
@@ -866,8 +796,6 @@
crbug.com/467477 fast/multicol/vertical-rl/nested-columns.html [ Failure ]
-crbug.com/506525 [ XP ] paint/masks/fieldset-mask.html [ Failure ]
-
crbug.com/400841 media/video-canvas-draw.html [ Failure ]
crbug.com/400829 media/video-object-fit.html [ Failure ]
crbug.com/400829 virtual/stable/media/stable/video-object-fit-stable.html [ Failure ]
@@ -879,10 +807,6 @@
crbug.com/441559 virtual/stable/web-animations-api/partial-keyframes-unsupported.html [ Pass ]
crbug.com/437696 virtual/stable/web-animations-api/additive-animations-unsupported.html [ Pass ]
-crbug.com/578663 [ XP ] fast/canvas/canvas-imageSmoothingQuality-pixel.html [ NeedsRebaseline ]
-crbug.com/578663 [ XP ] fast/images/exif-orientation-height-image-document.html [ NeedsRebaseline ]
-crbug.com/578663 [ XP ] virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingQuality-pixel.html [ NeedsRebaseline ]
-
# switching to apache-win32: needs triaging.
crbug.com/528062 [ Win ] http/tests/css/missing-repaint-after-slow-style-sheet.pl [ Failure ]
crbug.com/528062 [ Win ] http/tests/local/blob/send-data-blob.html [ Failure ]
@@ -915,15 +839,6 @@
crbug.com/425345 [ Mac ] fast/text/line-break-after-question-mark.html [ Failure ]
-crbug.com/579816 [ XP ] fast/borders/border-image-outset-in-shorthand.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] fast/borders/border-image-outset-split-inline.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] fast/borders/border-image-outset.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] fast/borders/border-image-slice-constrained.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] fast/gradients/border-image-gradient-sides-and-corners.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] fast/writing-mode/border-image-vertical-lr.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] fast/writing-mode/border-image-vertical-rl.html [ NeedsRebaseline ]
-crbug.com/579816 [ XP ] svg/W3C-SVG-1.1/coords-units-01-b.svg [ NeedsRebaseline ]
-
# When drawing subpixel smoothed glyphs, CoreGraphics will fake bold the glyphs.
# In this configuration, the pixel smoothed glyphs will be created from subpixel smoothed glyphs.
# This means that CoreGraphics may draw outside the reported glyph bounds, and in this case does.
@@ -1004,8 +919,6 @@
crbug.com/482229 compositing/layer-creation/fixed-position-under-transform.html [ Failure ]
-crbug.com/548630 [ XP ] fast/text/justify-vertical.html [ Failure ]
-
crbug.com/471824 imported/web-platform-tests/pointerevents/ [ Skip ]
crbug.com/471824 virtual/pointerevent/imported/web-platform-tests/pointerevents/pointerevent_touch-action-illegal.html [ Skip ]
crbug.com/471824 virtual/pointerevent/imported/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html [ Skip ]
@@ -1039,9 +952,6 @@
crbug.com/478109 [ Mac10.6 ] fast/text/bidi-embedding-pop-and-push-same-2.html [ Failure ]
-crbug.com/369979 [ XP ] fast/table/table-display-types-vertical.html [ NeedsRebaseline ]
-crbug.com/369979 [ XP ] fast/table/table-display-types.html [ NeedsRebaseline ]
-
# These need a rebaseline due crbug.com/504745 on Windows when they are activated again.
crbug.com/521124 crbug.com/410145 [ Win ] fast/text/international/vertical-text-glyph-test.html [ Pass Failure ]
crbug.com/521124 crbug.com/410145 [ Win ] fast/text/international/text-combine-image-test.html [ Pass Failure ]
@@ -1095,8 +1005,6 @@
crbug.com/445194 [ Debug ] fast/dom/shadow/focus-controller-recursion-crash.html [ Skip ]
crbug.com/505387 [ Win ] virtual/prefer_compositing_to_lcd_text/scrollbars/rtl/overflow-scroll-rtl.html [ Failure ]
-crbug.com/505415 [ XP ] accessibility/canvas-fallback-content-labels.html [ Failure ]
-
# Mac10.10-specific failures that still need triaging.
# Form controls need rebaseline because of the default font change.
# If you see wider INPUT elements or narrower TEXTAREA elements, you may do just
@@ -1295,34 +1203,10 @@
crbug.com/521730 [ Win10 ] svg/css/text-shadow-multiple.xhtml [ Failure ]
crbug.com/521730 [ Win10 ] svg/custom/textPath-change-id2-pattern.svg [ Failure ]
-crbug.com/390040 [ XP ] css3/filters/nested-filter.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/borders/border-radius-percent.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/css/resize-corner-tracking-transformed.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/forms/select-popup/popup-menu-appearance-transform.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/frames/frame-set-scaling-rotate.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/frames/frame-set-scaling-skew.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/overflow/overflow-update-transform.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/replaced/selection-rect-transform.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/transforms/transformed-focused-text-input.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] inspector/layers/layer-canvas-log.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] media/audio-repaint.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] printing/iframe-print.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] svg/dynamic-updates/SVG-dynamic-css-transform.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] virtual/threaded/printing/iframe-print.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/forms/placeholder-position.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] svg/transforms/animated-path-inside-transformed-html.xhtml [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] svg/transforms/text-with-pattern-inside-transformed-html.xhtml [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] virtual/threaded/printing/ellipsis-printing-style.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] printing/ellipsis-printing-style.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/forms/select/listbox-appearance-basic.html [ NeedsRebaseline ]
-crbug.com/390040 [ XP ] fast/frames/iframe-scaling-with-scroll.html [ NeedsRebaseline ]
-
crbug.com/571233 compositing/background-color/background-color-outside-document.html [ Skip ]
crbug.com/474759 fast/writing-mode/vertical-rl-replaced-selection.html [ Failure ]
crbug.com/474759 fast/block/line-layout/selection-highlight-overlap.html [ Failure ]
-crbug.com/502927 [ XP ] paint/frames/frameset-with-stacking-context-and-not-stacking-context-children.html [ Failure ]
-crbug.com/502927 [ XP ] paint/frames/frameset-with-stacking-contexts.html [ Failure ]
crbug.com/353746 virtual/android/fullscreen/video-specified-size.html [ Failure Pass ]
@@ -1361,35 +1245,6 @@
crbug.com/543369 [ Linux ] fast/forms/select-popup/popup-menu-appearance-tall.html [ Failure ]
-# SK_SUPPORT_LEGACY_PATH_MEASURE_TVALUE
-crbug.com/438390 [ XP ] svg/W3C-SVG-1.1/animate-elem-33-t.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/W3C-SVG-1.1/text-align-04-b.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/W3C-SVG-1.1/text-path-01-b.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animate-elem-06-t-drt.html [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animate-elem-07-t-drt.html [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animate-elem-08-t-drt.html [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animate-text-nested-transforms.html [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animateMotion-accumulate-1c.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animateMotion-accumulate-2a.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/animations/animateMotion-accumulate-2b.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/longTextOnPath.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/textGlyphOrientationHorizontal.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/textOnPath.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/textOnPath2.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/textOnPath3.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/textOnPathSpaces.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/verticalText.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/batik/text/verticalTextOnPath.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/custom/text-match-highlight.html [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/filters/subRegion-one-effect.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/filters/subRegion-two-effects.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/text/bbox-with-glyph-overflow-on-path.html [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/text/text-selection-align-04-b.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/text/text-selection-path-01-b.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/text/textPathBoundsBug.svg [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] svg/transforms/svg-css-transforms.xhtml [ NeedsRebaseline ]
-crbug.com/438390 [ XP ] transforms/svg-vs-css.xhtml [ NeedsRebaseline ]
-
crbug.com/575917 fast/js/const.html [ NeedsManualRebaseline ]
crbug.com/575917 fast/js/inc-const-valueOf.html [ NeedsManualRebaseline ]
crbug.com/575917 fast/js/kde/const.html [ NeedsManualRebaseline ]
@@ -1399,7 +1254,6 @@
crbug.com/570391 inspector/sources/debugger/promise-events.html [ NeedsManualRebaseline ]
crbug.com/548765 http/tests/inspector/console-fetch-logging.html [ Failure Pass ]
-crbug.com/549314 [ XP ] inspector-protocol/layout-fonts/unicode-range-combining-chars-fallback.html [ Failure ]
crbug.com/573287 inspector/console/console-dir.html [ NeedsManualRebaseline ]
crbug.com/573287 inspector/console/console-big-array.html [ NeedsManualRebaseline ]
@@ -1407,47 +1261,18 @@
crbug.com/563694 [ Linux Mac Debug ] svg/hixie/perf/005.xml [ Failure ]
-crbug.com/564109 [ Win7 XP ] http/tests/webfont/font-display.html [ Pass Timeout Failure ]
+crbug.com/564109 [ Win7 ] http/tests/webfont/font-display.html [ Pass Timeout Failure ]
crbug.com/558574 [ Win7 ] fast/text/emphasis.html [ Failure ]
crbug.com/574196 fast/js/mozilla/strict/13.1.html [ NeedsManualRebaseline ]
-crbug.com/561595 [ XP ] plugins/webview-plugin-scroll.html [ Failure ]
-crbug.com/561595 [ XP ] plugins/webview-plugin-nested-iframe-scroll.html [ Failure ]
-
-crbug.com/568778 [ XP ] media/video-aspect-ratio.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-colorspace-yuv420.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-colorspace-yuv422.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-controls-rendering.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-controls-with-cast-rendering.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-layer-crash.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-overlay-cast-dark-rendering.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-overlay-cast-light-rendering.html [ Failure ]
-crbug.com/568778 [ XP ] media/video-transformed.html [ Failure ]
-crbug.com/568778 [ XP ] svg/wicd/test-rightsizing-a.xhtml [ Failure ]
-crbug.com/568778 [ XP ] svg/zoom/page/zoom-hixie-mixed-009.xml [ Failure ]
-crbug.com/568778 [ XP ] svg/zoom/page/zoom-replaced-intrinsic-ratio-001.htm [ Failure ]
-crbug.com/568778 [ XP ] svg/zoom/page/zoom-svg-through-object-with-auto-size.html [ Failure ]
-crbug.com/568778 [ XP ] svg/zoom/page/zoom-svg-through-object-with-huge-size.xhtml [ Failure ]
-crbug.com/568778 [ XP ] svg/zoom/page/zoom-svg-through-object-with-percentage-size.xhtml [ Failure ]
-crbug.com/568778 [ XP ] tables/mozilla/bugs/bug101674.html [ Failure ]
-crbug.com/568778 [ XP ] tables/mozilla/bugs/bug14929.html [ Failure ]
-crbug.com/568778 [ XP ] tables/mozilla/bugs/bug86708.html [ Failure ]
-crbug.com/568778 [ XP ] tables/mozilla_expected_failures/bugs/97619.html [ Failure ]
-crbug.com/568778 [ XP ] tables/mozilla_expected_failures/bugs/bug85016.html [ Failure ]
-
-# crbug.com/504837 [ XP ] svg/batik/filters/feTile.svg [ Failure ]
-# crbug.com/504837 [ XP ] svg/filters/feTile.svg [ Failure ]
-
crbug.com/568559 [ Android Linux Win ] fast/forms/select/HTMLOptionElement_label03.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] editing/selection/replaced-boundaries-3.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] compositing/overflow/update-widget-positions-on-nested-frames-and-scrollers.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-disabled-appearance.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] editing/selection/caret-before-select.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-styled.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/control-restrict-line-height.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-empty.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-style.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/menulist-deselect-update.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] tables/mozilla/bugs/bug2479-3.html [ NeedsRebaseline ]
@@ -1465,7 +1290,6 @@
crbug.com/568559 [ Android Linux Win ] fast/forms/form-radio-img-node-list.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/menulist-no-overflow.html [ NeedsRebaseline ]
crbug.com/568559 fast/forms/select/menulist-appearance-basic.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-single-option.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-size-invalid.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] tables/mozilla/bugs/bug4382.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] virtual/prefer_compositing_to_lcd_text/compositing/overflow/update-widget-positions-on-nested-frames-and-scrollers.html [ NeedsRebaseline ]
@@ -1475,7 +1299,6 @@
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-dirty-parent-pref-widths.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-initial-position.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] tables/mozilla/bugs/bug1188.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-zoom090.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] editing/selection/select-element-paragraph-boundary.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/form-element-geometry.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] tables/mozilla_expected_failures/bugs/bug2479-5.html [ NeedsRebaseline ]
@@ -1488,14 +1311,11 @@
crbug.com/568559 [ Android Linux Win ] tables/mozilla/bugs/bug29326.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/HTMLOptionElement_label06.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/parser/document-write-option.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/text/text-font-height-mismatch.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] editing/selection/select-box.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/001.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/text/emphasis-vertical.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/html/keygen.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/replaced/three-selects-break.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] tables/mozilla/dom/tableDom.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] css3/selectors3/xml/css3-modsel-161.xml [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/writing-mode/english-lr-text.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] tables/mozilla/bugs/bug2479-4.html [ NeedsRebaseline ]
@@ -1505,7 +1325,6 @@
crbug.com/568559 [ Android Linux Win ] fast/forms/select/option-script.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/HTMLOptionElement_label01.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] css3/selectors3/html/css3-modsel-161.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-zoom.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/option-text-clip.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/text/international/menulist-width-rtl.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/replaced/replaced-breaking-mixture.html [ NeedsRebaseline ]
@@ -1520,7 +1339,6 @@
crbug.com/568559 [ Android Linux Win ] editing/pasteboard/4641033.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] css3/selectors3/xhtml/css3-modsel-161.xml [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] tables/mozilla/bugs/bug33855.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-many.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/block/float/float-avoidance.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/block/margin-collapse/103.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/color/color-suggestion-picker-appearance-zoom125.html [ NeedsRebaseline ]
@@ -1529,13 +1347,10 @@
crbug.com/568559 [ Android Linux Win ] fast/forms/color/color-suggestion-picker-one-row-appearance.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/color/color-suggestion-picker-two-row-appearance.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/color/color-suggestion-picker-with-scrollbar-appearance.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-long.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-tall.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-align.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/forms/select/select-writing-direction-natural.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/text/international/bidi-menulist.html [ NeedsRebaseline ]
crbug.com/568559 [ Android Linux Win ] fast/text/international/pop-up-button-text-alignment-and-direction.html [ NeedsRebaseline ]
-crbug.com/568559 [ XP ] fast/forms/select-popup/popup-menu-appearance-texttransform.html [ NeedsRebaseline ]
# https://codereview.chromium.org/1623073003/
crbug.com/453040 svg/W3C-SVG-1.1/animate-elem-37-t.svg [ NeedsRebaseline ]
@@ -1564,7 +1379,7 @@
crbug.com/569950 svg/filters/feTile.svg [ NeedsRebaseline ]
crbug.com/570611 fast/inline/inline-box-background-repeat-x.html [ NeedsRebaseline ]
-crbug.com/570611 [ Mac Linux Android XP Win7 ] fast/text/emphasis-combined-text.html [ NeedsRebaseline ]
+crbug.com/570611 [ Mac Linux Android Win7 ] fast/text/emphasis-combined-text.html [ NeedsRebaseline ]
crbug.com/570611 ietestcenter/css3/bordersbackgrounds/background-repeat-space-padding-box.htm [ NeedsRebaseline ]
crbug.com/568867 [ Win Debug ] transforms/3d/point-mapping/3d-point-mapping-deep.html [ Failure ]
@@ -1601,8 +1416,6 @@
crbug.com/571716 inspector/audits/audits-panel-functional.html [ Crash Pass ]
-crbug.com/451577 [ XP ] inspector/console/console-stack-overflow.html [ Crash Pass ]
-
crbug.com/571721 inspector/console/console-xpath.html [ Timeout Pass ]
crbug.com/571762 [ Mac10.7 ] inspector/console/inspect-html-all-collection.html [ Timeout Pass ]
@@ -1615,7 +1428,7 @@
crbug.com/572710 [ Debug ] inspector/extensions/extensions-sidebar.html [ Timeout Pass ]
-crbug.com/572714 [ Linux XP ] inspector/sources/debugger/debug-inlined-scripts.html [ Timeout Crash Pass ]
+crbug.com/572714 [ Linux ] inspector/sources/debugger/debug-inlined-scripts.html [ Timeout Crash Pass ]
crbug.com/572723 [ Mac10.7 Release ] inspector/sources/debugger/debugger-completions-on-call-frame.html [ Timeout Pass ]
crbug.com/572723 [ Linux Mac10.9 ] inspector/sources/debugger/debugger-disable-enable.html [ Pass Failure Timeout ]
@@ -1662,4 +1475,4 @@
crbug.com/581038 fast/text/first-letter-bad-line-boxes-crash.html [ Crash Pass ]
-crbug.com/581203 [ Linux ] web-animations-api/player-finish-sample-only.html [ Failure Pass ]
\ No newline at end of file
+crbug.com/581203 [ Linux ] web-animations-api/player-finish-sample-only.html [ Failure Pass ]
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_unittest.py
index 5f00b037..fac9754 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_unittest.py
@@ -11,7 +11,7 @@
class LayoutTestFinderTests(unittest.TestCase):
def test_find_fastest_tests(self):
host = MockHost()
- port = host.port_factory.get('test-win-xp', None)
+ port = host.port_factory.get('test-win-win7', None)
all_tests = [
'path/test.html',
@@ -61,7 +61,7 @@
def test_find_fastest_tests_excludes_deleted_tests(self):
host = MockHost()
- port = host.port_factory.get('test-win-xp', None)
+ port = host.port_factory.get('test-win-win7', None)
all_tests = [
'fast/css/1.html',
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
index 2527c8f..2c8955e 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
@@ -258,7 +258,7 @@
return False
# 2) Collapse specifier sets with common specifiers:
- # (xp, release), (xp, debug) --> (xp, x86)
+ # (win7, release), (win7, debug) --> (win7, x86)
for size, collapsing_sets in self._collapsing_sets_by_size.items():
while try_collapsing(size, collapsing_sets):
pass
@@ -278,19 +278,19 @@
return False
# 3) Abbreviate specifier sets by combining specifiers across categories.
- # (xp, release), (win7, release) --> (xp, win7, release)
+ # (win7, release), (win10, release) --> (win7, win10, release)
while try_abbreviating(self._collapsing_sets_by_size.values()):
pass
# 4) Substitute specifier subsets that match macros witin each set:
- # (xp, win7, release) -> (win, release)
+ # (win7, win10, release) -> (win, release)
self.collapse_macros(self._configuration_macros, specifiers_list)
macro_keys = set(self._configuration_macros.keys())
# 5) Collapsing macros may have created combinations the can now be abbreviated.
- # (xp, release), (linux, x86, release), (linux, x86_64, release) --> (xp, release), (linux, release) --> (xp, linux, release)
+ # (win7, release), (linux, x86, release), (linux, x86_64, release) --> (win7, release), (linux, release) --> (win7, linux, release)
while try_abbreviating([self._collapsing_sets_by_category['version'] | macro_keys]):
pass
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py
index 39be878..d5c47ae 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py
@@ -34,7 +34,6 @@
def make_mock_all_test_configurations_set():
all_test_configurations = set()
for version, architecture in (('snowleopard', 'x86'),
- ('xp', 'x86'),
('win7', 'x86'),
('vista', 'x86'),
('linux32', 'x86'),
@@ -46,60 +45,60 @@
MOCK_MACROS = {
'mac': ['snowleopard'],
- 'win': ['xp', 'vista', 'win7'],
+ 'win': ['vista', 'win7'],
'linux': ['linux32', 'precise', 'trusty'],
}
class TestConfigurationTest(unittest.TestCase):
def test_items(self):
- config = TestConfiguration('xp', 'x86', 'release')
+ config = TestConfiguration('win7', 'x86', 'release')
result_config_dict = {}
for category, specifier in config.items():
result_config_dict[category] = specifier
- self.assertEqual({'version': 'xp', 'architecture': 'x86', 'build_type': 'release'}, result_config_dict)
+ self.assertEqual({'version': 'win7', 'architecture': 'x86', 'build_type': 'release'}, result_config_dict)
def test_keys(self):
- config = TestConfiguration('xp', 'x86', 'release')
+ config = TestConfiguration('win7', 'x86', 'release')
result_config_keys = []
for category in config.keys():
result_config_keys.append(category)
self.assertEqual(set(['version', 'architecture', 'build_type']), set(result_config_keys))
def test_str(self):
- config = TestConfiguration('xp', 'x86', 'release')
- self.assertEqual('<xp, x86, release>', str(config))
+ config = TestConfiguration('win7', 'x86', 'release')
+ self.assertEqual('<win7, x86, release>', str(config))
def test_repr(self):
- config = TestConfiguration('xp', 'x86', 'release')
- self.assertEqual("TestConfig(version='xp', architecture='x86', build_type='release')", repr(config))
+ config = TestConfiguration('win7', 'x86', 'release')
+ self.assertEqual("TestConfig(version='win7', architecture='x86', build_type='release')", repr(config))
def test_hash(self):
config_dict = {}
- config_dict[TestConfiguration('xp', 'x86', 'release')] = True
- self.assertIn(TestConfiguration('xp', 'x86', 'release'), config_dict)
- self.assertTrue(config_dict[TestConfiguration('xp', 'x86', 'release')])
+ config_dict[TestConfiguration('win7', 'x86', 'release')] = True
+ self.assertIn(TestConfiguration('win7', 'x86', 'release'), config_dict)
+ self.assertTrue(config_dict[TestConfiguration('win7', 'x86', 'release')])
def query_unknown_key():
- return config_dict[TestConfiguration('xp', 'x86', 'debug')]
+ return config_dict[TestConfiguration('win7', 'x86', 'debug')]
self.assertRaises(KeyError, query_unknown_key)
- self.assertIn(TestConfiguration('xp', 'x86', 'release'), config_dict)
- self.assertNotIn(TestConfiguration('xp', 'x86', 'debug'), config_dict)
- configs_list = [TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'debug'), TestConfiguration('xp', 'x86', 'debug')]
+ self.assertIn(TestConfiguration('win7', 'x86', 'release'), config_dict)
+ self.assertNotIn(TestConfiguration('win7', 'x86', 'debug'), config_dict)
+ configs_list = [TestConfiguration('win7', 'x86', 'release'), TestConfiguration('win7', 'x86', 'debug'), TestConfiguration('win7', 'x86', 'debug')]
self.assertEqual(len(configs_list), 3)
self.assertEqual(len(set(configs_list)), 2)
def test_eq(self):
- self.assertEqual(TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'release'))
- self.assertNotEquals(TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'debug'))
+ self.assertEqual(TestConfiguration('win7', 'x86', 'release'), TestConfiguration('win7', 'x86', 'release'))
+ self.assertNotEquals(TestConfiguration('win7', 'x86', 'release'), TestConfiguration('win7', 'x86', 'debug'))
def test_values(self):
- config = TestConfiguration('xp', 'x86', 'release')
+ config = TestConfiguration('win7', 'x86', 'release')
result_config_values = []
for value in config.values():
result_config_values.append(value)
- self.assertEqual(set(['xp', 'x86', 'release']), set(result_config_values))
+ self.assertEqual(set(['win7', 'x86', 'release']), set(result_config_values))
class SpecifierSorterTest(unittest.TestCase):
@@ -111,7 +110,7 @@
sorter = SpecifierSorter()
self.assertIsNone(sorter.category_for_specifier('control'))
sorter = SpecifierSorter(self._all_test_configurations)
- self.assertEqual(sorter.category_for_specifier('xp'), 'version')
+ self.assertEqual(sorter.category_for_specifier('win7'), 'version')
sorter = SpecifierSorter(self._all_test_configurations, MOCK_MACROS)
self.assertEqual(sorter.category_for_specifier('mac'), 'version')
@@ -169,24 +168,23 @@
self.assertEqual(converter.to_config_set(set(['foo'])), set())
- self.assertEqual(converter.to_config_set(set(['xp', 'foo'])), set())
+ self.assertEqual(converter.to_config_set(set(['win7', 'foo'])), set())
errors = []
- self.assertEqual(converter.to_config_set(set(['xp', 'foo']), errors), set())
+ self.assertEqual(converter.to_config_set(set(['win7', 'foo']), errors), set())
self.assertEqual(errors, ["Unrecognized specifier 'foo'"])
- self.assertEqual(converter.to_config_set(set(['xp', 'x86_64'])), set())
+ self.assertEqual(converter.to_config_set(set(['win7', 'x86_64'])), set())
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
])
- self.assertEqual(converter.to_config_set(set(['xp', 'release'])), configs_to_match)
+ self.assertEqual(converter.to_config_set(set(['win7', 'release'])), configs_to_match)
configs_to_match = set([
TestConfiguration('snowleopard', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('linux32', 'x86', 'release'),
TestConfiguration('precise', 'x86_64', 'release'),
TestConfiguration('trusty', 'x86_64', 'release'),
@@ -234,14 +232,12 @@
converter = TestConfigurationConverter(self._all_test_configurations, MOCK_MACROS)
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
])
self.assertEqual(converter.to_config_set(set(['win', 'release'])), configs_to_match)
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('linux32', 'x86', 'release'),
@@ -251,7 +247,6 @@
configs_to_match)
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('snowleopard', 'x86', 'release'),
@@ -265,28 +260,28 @@
self.assertEqual(converter.to_specifiers_list(set()), [])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
])
- self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['release', 'xp'])])
+ self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['release', 'win7'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
- TestConfiguration('xp', 'x86', 'debug'),
+ TestConfiguration('win7', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'debug'),
])
- self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['xp'])])
+ self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win7'])])
configs_to_match = set([
TestConfiguration('linux32', 'x86', 'debug'),
TestConfiguration('precise', 'x86_64', 'debug'),
TestConfiguration('trusty', 'x86_64', 'debug'),
- TestConfiguration('xp', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
])
self.assertEqual(converter.to_specifiers_list(configs_to_match),
- [set(['release', 'xp']), set(['debug', 'linux'])])
+ [set(['release', 'win7']), set(['debug', 'linux'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
- TestConfiguration('xp', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('trusty', 'x86_64', 'debug'),
TestConfiguration('precise', 'x86_64', 'debug'),
TestConfiguration('linux32', 'x86', 'debug'),
@@ -295,13 +290,12 @@
TestConfiguration('linux32', 'x86', 'debug'),
])
self.assertEqual(converter.to_specifiers_list(configs_to_match),
- [set(['release', 'xp']), set(['debug', 'linux'])])
+ [set(['release', 'win7']), set(['debug', 'linux'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('snowleopard', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
- TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('linux32', 'x86', 'release'),
TestConfiguration('precise', 'x86_64', 'release'),
TestConfiguration('trusty', 'x86_64', 'release'),
@@ -309,20 +303,19 @@
self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['release'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
+ TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('snowleopard', 'x86', 'release'),
])
- self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['xp', 'mac', 'release'])])
+ self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win7', 'mac', 'release'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('snowleopard', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'debug'),
TestConfiguration('trusty', 'x86_64', 'release'),
])
self.assertEqual(converter.to_specifiers_list(configs_to_match),
- [set(['win7']), set(['release', 'xp', 'mac', 'trusty'])])
+ [set(['win7']), set(['release', 'mac', 'trusty'])])
def test_macro_collapsing(self):
macros = {'foo': ['bar', 'baz'], 'people': ['bob', 'alice', 'john']}
@@ -347,14 +340,12 @@
converter = TestConfigurationConverter(self._all_test_configurations, MOCK_MACROS)
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
])
self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win', 'release'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('linux32', 'x86', 'release'),
@@ -364,7 +355,6 @@
self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win', 'linux', 'release'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('snowleopard', 'x86', 'release'),
@@ -372,7 +362,6 @@
self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win', 'mac', 'release'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('snowleopard', 'x86', 'release'),
@@ -380,7 +369,6 @@
self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win', 'mac', 'release'])])
configs_to_match = set([
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('vista', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'release'),
])
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
index a365f67..5b17cc2 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
@@ -231,7 +231,7 @@
# FIXME: Update the original specifiers and remove this once the old syntax is gone.
_configuration_tokens_list = [
'Mac', 'Mac10.6', 'Mac10.7', 'Mac10.8', 'Mac10.9', 'Mac10.10', 'Retina',
- 'Win', 'XP', 'Win7', 'Win10',
+ 'Win', 'Win7', 'Win10',
'Linux', 'Linux32', 'Precise', 'Trusty',
'Android',
'Release',
@@ -411,6 +411,9 @@
self.warnings = []
self.is_skipped_outside_expectations_file = False
+ def __str__(self):
+ return "TestExpectationLine{name=%s, matching_configurations=%s, original_string=%s}" % (self.name, self.matching_configurations, self.original_string)
+
def __eq__(self, other):
return (self.original_string == other.original_string
and self.filename == other.filename
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
index 9d667f2..2c5a2a8d 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
@@ -43,11 +43,11 @@
class Base(unittest.TestCase):
# Note that all of these tests are written assuming the configuration
- # being tested is Windows XP, Release build.
+ # being tested is Windows 7, Release build.
def __init__(self, testFunc):
host = MockHost()
- self._port = host.port_factory.get('test-win-xp', None)
+ self._port = host.port_factory.get('test-win-win7', None)
self._exp = None
unittest.TestCase.__init__(self, testFunc)
@@ -113,7 +113,7 @@
expectations = TestExpectations(port, self.get_basic_tests())
self.assertEqual(expectations.get_expectations('failures/expected/text.html'), set([FAIL]))
- port = host.port_factory.get('test-win-xp', None)
+ port = host.port_factory.get('test-win-win7', None)
port.expectations_dict = lambda: expectations_dict
expectations = TestExpectations(port, self.get_basic_tests())
self.assertEqual(expectations.get_expectations('failures/expected/text.html'), set([PASS]))
@@ -322,7 +322,7 @@
class SkippedTests(Base):
def check(self, expectations, overrides, skips, lint=False, expected_results=[WONTFIX, SKIP, FAIL]):
- port = MockHost().port_factory.get('test-win-xp')
+ port = MockHost().port_factory.get('test-win-win7')
port._filesystem.write_text_file(port._filesystem.join(port.layout_tests_dir(), 'failures/expected/text.html'), 'foo')
expectations_dict = OrderedDict()
expectations_dict['expectations'] = expectations
@@ -358,7 +358,7 @@
skips=['failures/expected'])
def test_skipped_entry_dont_exist(self):
- port = MockHost().port_factory.get('test-win-xp')
+ port = MockHost().port_factory.get('test-win-win7')
expectations_dict = OrderedDict()
expectations_dict['expectations'] = ''
port.expectations_dict = lambda: expectations_dict
@@ -529,13 +529,13 @@
def test_macro_overrides(self):
self.assert_bad_expectations("Bug(test) [ Win ] passes/text.html [ Pass ]\n"
- "Bug(test) [ XP ] passes/text.html [ Failure ]\n")
+ "Bug(test) [ Win7 ] passes/text.html [ Failure ]\n")
class RemoveConfigurationsTest(Base):
def test_remove(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -547,13 +547,13 @@
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- self.assertEqual("""Bug(x) [ Linux Win7 Release ] failures/expected/foo.html [ Failure ]
+ self.assertEqual("""Bug(x) [ Linux Win10 Release ] failures/expected/foo.html [ Failure ]
Bug(y) [ Win Mac Debug ] failures/expected/foo.html [ Crash ]
""", actual_expectations)
def test_remove_needs_rebaseline(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -564,13 +564,13 @@
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- self.assertEqual("""Bug(x) [ XP Debug ] failures/expected/foo.html [ NeedsRebaseline ]
-Bug(x) [ Win7 ] failures/expected/foo.html [ NeedsRebaseline ]
+ self.assertEqual("""Bug(x) [ Win7 Debug ] failures/expected/foo.html [ NeedsRebaseline ]
+Bug(x) [ Win10 ] failures/expected/foo.html [ NeedsRebaseline ]
""", actual_expectations)
def test_remove_multiple_configurations(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -582,7 +582,7 @@
actual_expectations = expectations.remove_configurations([
('failures/expected/foo.html', test_config),
- ('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration()),
+ ('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration()),
])
self.assertEqual("""Bug(y) [ Win Debug ] failures/expected/foo.html [ Crash ]
@@ -590,7 +590,7 @@
def test_remove_line_with_comments(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -603,14 +603,14 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual("""Bug(y) [ Win Debug ] failures/expected/foo.html [ Crash ]
""", actual_expectations)
def test_remove_line_with_comments_at_start(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -624,15 +624,16 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual("""
Bug(y) [ Win Debug ] failures/expected/foo.html [ Crash ]
""", actual_expectations)
def test_remove_line_with_comments_at_end_with_no_trailing_newline(self):
+ # TODO(wkorman): Simplify the redundant initialization in every test case.
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -644,13 +645,13 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual("""Bug(y) [ Win Debug ] failures/expected/foo.html [ Crash ]""", actual_expectations)
def test_remove_line_leaves_comments_for_next_line(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -663,7 +664,7 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual("""
# This comment line should not get stripped.
@@ -672,7 +673,7 @@
def test_remove_line_no_whitespace_lines(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -686,7 +687,7 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual(""" # This comment line should not get stripped.
Bug(y) [ Win Debug ] failures/expected/foo.html [ Crash ]
@@ -694,7 +695,7 @@
def test_remove_first_line(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -706,7 +707,7 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual(""" # This comment line should not get stripped.
Bug(y) [ Win Debug ] failures/expected/foo.html [ Crash ]
@@ -714,7 +715,7 @@
def test_remove_flaky_line(self):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
test_port.test_exists = lambda test: True
test_port.test_isfile = lambda test: True
@@ -725,7 +726,7 @@
expectations = TestExpectations(test_port)
actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', test_config)])
- actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win7', None).test_configuration())])
+ actual_expectations = expectations.remove_configurations([('failures/expected/foo.html', host.port_factory.get('test-win-win10', None).test_configuration())])
self.assertEqual("""Bug(x) [ Win Debug ] failures/expected/foo.html [ Failure Timeout ]
Bug(y) [ Mac ] failures/expected/foo.html [ Crash ]
@@ -745,10 +746,10 @@
class TestExpectationsParserTests(unittest.TestCase):
def __init__(self, testFunc):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
self._converter = TestConfigurationConverter(test_port.all_test_configurations(), test_port.configuration_specifier_macros())
unittest.TestCase.__init__(self, testFunc)
- self._parser = TestExpectationParser(host.port_factory.get('test-win-xp', None), [], is_lint_mode=False)
+ self._parser = TestExpectationParser(host.port_factory.get('test-win-win7', None), [], is_lint_mode=False)
def test_expectation_line_for_test(self):
# This is kind of a silly test, but it at least ensures that we don't throw an error.
@@ -769,7 +770,7 @@
class TestExpectationSerializationTests(unittest.TestCase):
def __init__(self, testFunc):
host = MockHost()
- test_port = host.port_factory.get('test-win-xp', None)
+ test_port = host.port_factory.get('test-win-win7', None)
self._converter = TestConfigurationConverter(test_port.all_test_configurations(), test_port.configuration_specifier_macros())
unittest.TestCase.__init__(self, testFunc)
@@ -784,7 +785,7 @@
def assert_list_round_trip(self, in_string, expected_string=None):
host = MockHost()
- parser = TestExpectationParser(host.port_factory.get('test-win-xp', None), [], is_lint_mode=False)
+ parser = TestExpectationParser(host.port_factory.get('test-win-win7', None), [], is_lint_mode=False)
expectations = parser.parse('path', in_string)
if expected_string is None:
expected_string = in_string
@@ -827,10 +828,10 @@
expectation_line.name = 'test/name/for/realz.html'
expectation_line.parsed_expectations = set([IMAGE])
self.assertEqual(expectation_line.to_string(self._converter), None)
- expectation_line.matching_configurations = set([TestConfiguration('xp', 'x86', 'release')])
- self.assertEqual(expectation_line.to_string(self._converter), 'Bug(x) [ XP Release ] test/name/for/realz.html [ Failure ]')
- expectation_line.matching_configurations = set([TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'debug')])
- self.assertEqual(expectation_line.to_string(self._converter), 'Bug(x) [ XP ] test/name/for/realz.html [ Failure ]')
+ expectation_line.matching_configurations = set([TestConfiguration('win7', 'x86', 'release')])
+ self.assertEqual(expectation_line.to_string(self._converter), 'Bug(x) [ Win7 Release ] test/name/for/realz.html [ Failure ]')
+ expectation_line.matching_configurations = set([TestConfiguration('win7', 'x86', 'release'), TestConfiguration('win7', 'x86', 'debug')])
+ self.assertEqual(expectation_line.to_string(self._converter), 'Bug(x) [ Win7 ] test/name/for/realz.html [ Failure ]')
def test_parsed_to_string_mac_legacy_names(self):
expectation_line = TestExpectationLine()
@@ -914,12 +915,12 @@
if reconstitute:
reconstitute_only_these.append(expectation_line)
- add_line(set([TestConfiguration('xp', 'x86', 'release')]), True)
- add_line(set([TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'debug')]), False)
+ add_line(set([TestConfiguration('win7', 'x86', 'release')]), True)
+ add_line(set([TestConfiguration('win7', 'x86', 'release'), TestConfiguration('win7', 'x86', 'debug')]), False)
serialized = TestExpectations.list_to_string(lines, self._converter)
- self.assertEqual(serialized, "Bug(x) [ XP Release ] Yay [ Failure ]\nBug(x) [ XP ] Yay [ Failure ]")
+ self.assertEqual(serialized, "Bug(x) [ Win7 Release ] Yay [ Failure ]\nBug(x) [ Win7 ] Yay [ Failure ]")
serialized = TestExpectations.list_to_string(lines, self._converter, reconstitute_only_these=reconstitute_only_these)
- self.assertEqual(serialized, "Bug(x) [ XP Release ] Yay [ Failure ]\nNay")
+ self.assertEqual(serialized, "Bug(x) [ Win7 Release ] Yay [ Failure ]\nNay")
def disabled_test_string_whitespace_stripping(self):
# FIXME: Re-enable this test once we rework the code to no longer support the old syntax.
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index c9e3e12..104a3111 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -103,7 +103,6 @@
('mountainlion', 'x86'),
('mavericks', 'x86'),
('mac10.10', 'x86'),
- ('xp', 'x86'),
('win7', 'x86'),
('win10', 'x86'),
# FIXME: We handle 32bit Linux similarly to Mac retina above treating it
@@ -116,15 +115,9 @@
('icecreamsandwich', 'x86'),
)
- ALL_BASELINE_VARIANTS = [
- 'mac-mac10.10', 'mac-mavericks', 'mac-retina', 'mac-mountainlion', 'mac-lion', 'mac-snowleopard',
- 'win-win10', 'win-win7', 'win-xp'
- 'linux-trusty', 'linux-precise', 'linux-x86',
- ]
-
CONFIGURATION_SPECIFIER_MACROS = {
'mac': ['snowleopard', 'lion', 'mountainlion', 'retina', 'mavericks', 'mac10.10'],
- 'win': ['xp', 'win7', 'win10'],
+ 'win': ['win7', 'win10'],
'linux': ['linux32', 'precise', 'trusty'],
'android': ['icecreamsandwich'],
}
@@ -226,6 +219,9 @@
self._results_directory = None
self._virtual_test_suites = None
+ def __str__(self):
+ return "Port{name=%s, version=%s, architecture=%s, test_configuration=%s}" % (self._name, self._version, self._architecture, self._test_configuration)
+
def buildbot_archives_baselines(self):
return True
@@ -984,7 +980,7 @@
def version(self):
"""Returns a string indicating the version of a given platform, e.g.
- 'leopard' or 'xp'.
+ 'leopard' or 'win7'.
This is used to help identify the exact port when parsing test
expectations, determining search paths, and logging information."""
@@ -1260,21 +1256,13 @@
"""Ports may provide a way to abbreviate configuration specifiers to conveniently
refer to them as one term or alias specific values to more generic ones. For example:
- (xp, vista, win7) -> win # Abbreviate all Windows versions into one namesake.
+ (vista, win7) -> win # Abbreviate all Windows versions into one namesake.
(precise, trusty) -> linux # Change specific name of Linux distro to a more generic term.
Returns a dictionary, each key representing a macro term ('win', for example),
- and value being a list of valid configuration specifiers (such as ['xp', 'vista', 'win7'])."""
+ and value being a list of valid configuration specifiers (such as ['vista', 'win7'])."""
return self.CONFIGURATION_SPECIFIER_MACROS
- def all_baseline_variants(self):
- """Returns a list of platform names sufficient to cover all the baselines.
-
- The list should be sorted so that a later platform will reuse
- an earlier platform's baselines if they are the same (e.g.,
- 'mac10.10' should precede 'mac10.9')."""
- return self.ALL_BASELINE_VARIANTS
-
def _generate_all_test_configurations(self):
"""Returns a sequence of the TestConfigurations the port supports."""
# By default, we assume we want to test every graphics type in
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
index c67cccd..8d2ad63 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
@@ -79,7 +79,7 @@
port_name = 'win'
port_maker = browser_test.BrowserTestWinPort
os_name = 'win'
- os_version = 'xp'
+ os_version = 'win7'
driver_name_endswith = 'browser_tests.exe'
timeout_ms = 20 * 1000
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
index c703fc9..6a60043 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
@@ -72,12 +72,11 @@
# operating system, whereas host!=target for Android.
def test_win(self):
- self.assert_port(port_name='win-xp', cls=win.WinPort)
self.assert_port(port_name='win-win7', cls=win.WinPort)
self.assert_port(port_name='win-win10', cls=win.WinPort)
- self.assert_port(port_name='win', os_name='win', os_version='xp',
+ self.assert_port(port_name='win', os_name='win', os_version='win7',
cls=win.WinPort)
- self.assert_port(port_name='chromium', os_name='win', os_version='xp',
+ self.assert_port(port_name='chromium', os_name='win', os_version='win7',
cls=win.WinPort)
def test_unknown_specified(self):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
index a0a8a245..0121eeb 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
@@ -291,8 +291,6 @@
TestConfiguration('mavericks', 'x86', 'release'),
TestConfiguration('mac10.10', 'x86', 'debug'),
TestConfiguration('mac10.10', 'x86', 'release'),
- TestConfiguration('xp', 'x86', 'debug'),
- TestConfiguration('xp', 'x86', 'release'),
TestConfiguration('win7', 'x86', 'debug'),
TestConfiguration('win7', 'x86', 'release'),
TestConfiguration('win10', 'x86', 'debug'),
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py
index 90b2c57..b4bdaf12 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py
@@ -362,16 +362,22 @@
port_name = 'test'
default_port_name = 'test-mac-leopard'
- """Test implementation of the Port interface."""
+ # TODO(wkorman): The below constant is legacy code and is only referenced by a unit test. Find the modern way to do
+ # the same thing that test is doing and delete this.
+ #
+ # A list of platform names sufficient to cover all the baselines.
+ # The list should be sorted so that a later platform will reuse
+ # an earlier platform's baselines if they are the same (e.g.,
+ # 'mac10.10' should precede 'mac10.9').
ALL_BASELINE_VARIANTS = (
'test-linux-trusty', 'test-linux-precise', 'test-linux-x86',
'test-mac-snowleopard', 'test-mac-leopard',
- 'test-win-win7', 'test-win-xp',
+ 'test-win-win10', 'test-win-win7'
)
FALLBACK_PATHS = {
- 'xp': ['test-win-win7', 'test-win-xp'],
- 'win7': ['test-win-win7'],
+ 'win7': ['test-win-win7', 'test-win-win10'],
+ 'win10': ['test-win-win10'],
'leopard': ['test-mac-leopard', 'test-mac-snowleopard'],
'snowleopard': ['test-mac-snowleopard'],
'trusty': ['test-linux-trusty', 'test-win-win7'],
@@ -409,8 +415,8 @@
self._operating_system = 'linux'
version_map = {
- 'test-win-xp': 'xp',
'test-win-win7': 'win7',
+ 'test-win-win10': 'win10',
'test-mac-leopard': 'leopard',
'test-mac-snowleopard': 'snowleopard',
'test-linux-x86': 'linux32',
@@ -423,7 +429,7 @@
self._architecture = 'x86_64'
def buildbot_archives_baselines(self):
- return self._name != 'test-win-xp'
+ return self._name != 'test-win-win7'
def default_pixel_tests(self):
return True
@@ -515,7 +521,7 @@
return self._generic_expectations_path
def _port_specific_expectations_files(self):
- return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in ['test', 'test-win-xp']]
+ return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in ['test', 'test-win-win7']]
def all_test_configurations(self):
"""Returns a sequence of the TestConfigurations the port supports."""
@@ -533,8 +539,8 @@
def _all_systems(self):
return (('leopard', 'x86'),
('snowleopard', 'x86'),
- ('xp', 'x86'),
('win7', 'x86'),
+ ('win10', 'x86'),
('linux32', 'x86'),
('precise', 'x86_64'),
('trusty', 'x86_64'))
@@ -546,13 +552,10 @@
"""To avoid surprises when introducing new macros, these are intentionally fixed in time."""
return {
'mac': ['leopard', 'snowleopard'],
- 'win': ['xp', 'win7'],
+ 'win': ['win7', 'win10'],
'linux': ['linux32', 'precise', 'trusty']
}
- def all_baseline_variants(self):
- return self.ALL_BASELINE_VARIANTS
-
def virtual_test_suites(self):
return [
VirtualTestSuite(prefix='virtual_passes', base='passes', args=['--virtual-arg']),
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win.py
index 373ceb8..15d9f20a 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win.py
@@ -50,11 +50,10 @@
class WinPort(base.Port):
port_name = 'win'
- SUPPORTED_VERSIONS = ('xp', 'win7', 'win10')
+ SUPPORTED_VERSIONS = ('win7', 'win10')
FALLBACK_PATHS = {'win10': ['win']}
FALLBACK_PATHS['win7'] = ['win7'] + FALLBACK_PATHS['win10']
- FALLBACK_PATHS['xp'] = ['win-xp'] + FALLBACK_PATHS['win7']
DEFAULT_BUILD_DIRECTORIES = ('build', 'out')
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
index 08e21a0..d1c10ff 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
@@ -39,10 +39,10 @@
class WinPortTest(port_testcase.PortTestCase):
port_name = 'win'
- full_port_name = 'win-xp'
+ full_port_name = 'win-win7'
port_maker = win.WinPort
os_name = 'win'
- os_version = 'xp'
+ os_version = 'win7'
def test_setup_environ_for_server(self):
port = self.make_port()
@@ -72,17 +72,15 @@
def test_versions(self):
port = self.make_port()
- self.assertIn(port.name(), ('win-xp', 'win-win7'))
+ self.assertIn(port.name(), ('win-win7', 'win-win10'))
- self.assert_name(None, 'xp', 'win-xp')
- self.assert_name('win', 'xp', 'win-xp')
- self.assert_name('win-xp', 'xp', 'win-xp')
- self.assert_name('win-xp', '7sp0', 'win-xp')
+ self.assert_name(None, 'win7', 'win-win7')
+ self.assert_name('win', 'win7', 'win-win7')
self.assert_name(None, '10', 'win-win10')
self.assert_name('win', '10', 'win-win10')
self.assert_name('win-win10', '10', 'win-win10')
- self.assert_name('win-win10', 'xp', 'win-win10')
+ self.assert_name('win-win10', 'win7', 'win-win10')
self.assert_name(None, '8', 'win-win10')
self.assert_name(None, '8.1', 'win-win10')
@@ -98,13 +96,12 @@
self.assert_name('win-win7', '7sp1', 'win-win7')
self.assert_name('win-win7', '7sp0', 'win-win7')
self.assert_name('win-win7', 'vista', 'win-win7')
- self.assert_name('win-win7', 'xp', 'win-win7')
self.assert_name(None, 'future', 'win-win10')
self.assert_name('win', 'future', 'win-win10')
self.assert_name('win-win10', 'future', 'win-win10')
- self.assertRaises(AssertionError, self.assert_name, None, 'w2k', 'win-xp')
+ self.assertRaises(AssertionError, self.assert_name, None, 'w2k', 'win-win7')
def assert_baseline_paths(self, port_name, *expected_paths):
port = self.make_port(port_name=port_name)
@@ -114,7 +111,6 @@
self.assertTrue(port.baseline_search_path()[i].endswith(path))
def test_baseline_path(self):
- self.assert_baseline_paths('win-xp', 'win-xp', '/win7', '/win')
self.assert_baseline_paths('win-win7', 'win7', '/win')
self.assert_baseline_paths('win-win10', 'win')
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
index 8fb37fb2..1270330 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
@@ -36,7 +36,7 @@
class PrintExpectationsTest(unittest.TestCase):
- def run_test(self, tests, expected_stdout, platform='test-win-xp', **args):
+ def run_test(self, tests, expected_stdout, platform='test-win-win7', **args):
options = MockOptions(all=False, csv=False, full=False, platform=platform,
include_keyword=[], exclude_keyword=[], paths=False).update(**args)
tool = MockTool()
@@ -54,58 +54,58 @@
def test_basic(self):
self.run_test(['failures/expected/text.html', 'failures/expected/timeout.html'],
- ('// For test-win-xp\n'
+ ('// For test-win-win7\n'
'failures/expected/text.html [ Failure ]\n'
'failures/expected/timeout.html [ Timeout ]\n'))
def test_multiple(self):
self.run_test(['failures/expected/text.html', 'failures/expected/timeout.html'],
- ('// For test-win-win7\n'
+ ('// For test-win-win10\n'
'failures/expected/text.html [ Failure ]\n'
'failures/expected/timeout.html [ Timeout ]\n'
'\n'
- '// For test-win-xp\n'
+ '// For test-win-win7\n'
'failures/expected/text.html [ Failure ]\n'
'failures/expected/timeout.html [ Timeout ]\n'),
platform='test-win-*')
def test_full(self):
self.run_test(['failures/expected/text.html', 'failures/expected/timeout.html'],
- ('// For test-win-xp\n'
+ ('// For test-win-win7\n'
'Bug(test) failures/expected/text.html [ Failure ]\n'
'Bug(test) failures/expected/timeout.html [ Timeout ]\n'),
full=True)
def test_exclude(self):
self.run_test(['failures/expected/text.html', 'failures/expected/crash.html'],
- ('// For test-win-xp\n'
+ ('// For test-win-win7\n'
'failures/expected/text.html [ Failure ]\n'),
exclude_keyword=['crash'])
def test_include(self):
self.run_test(['failures/expected/text.html', 'failures/expected/crash.html'],
- ('// For test-win-xp\n'
+ ('// For test-win-win7\n'
'failures/expected/crash.html\n'),
include_keyword=['crash'])
def test_csv(self):
self.run_test(['failures/expected/text.html', 'failures/expected/image.html'],
- ('test-win-xp,failures/expected/image.html,Bug(test),,FAIL\n'
- 'test-win-xp,failures/expected/text.html,Bug(test),,FAIL\n'),
+ ('test-win-win7,failures/expected/image.html,Bug(test),,FAIL\n'
+ 'test-win-win7,failures/expected/text.html,Bug(test),,FAIL\n'),
csv=True)
def test_paths(self):
self.run_test([],
('/mock-checkout/LayoutTests/TestExpectations\n'
'LayoutTests/platform/test/TestExpectations\n'
- 'LayoutTests/platform/test-win-xp/TestExpectations\n'),
+ 'LayoutTests/platform/test-win-win7/TestExpectations\n'),
paths=True)
class PrintBaselinesTest(unittest.TestCase):
def setUp(self):
self.oc = None
self.tool = MockTool()
- self.test_port = self.tool.port_factory.get('test-win-xp')
+ self.test_port = self.tool.port_factory.get('test-win-win7')
self.tool.port_factory.get = lambda port_name=None: self.test_port
self.tool.port_factory.all_port_names = lambda: TestPort.ALL_BASELINE_VARIANTS
@@ -129,7 +129,7 @@
command.execute(MockOptions(all=False, include_virtual_tests=False, csv=False, platform=None), ['passes/text.html'], self.tool)
stdout, _, _ = self.restore_output()
self.assertMultiLineEqual(stdout,
- ('// For test-win-xp\n'
+ ('// For test-win-win7\n'
'passes/text-expected.png\n'
'passes/text-expected.txt\n'))
@@ -140,11 +140,11 @@
command.execute(MockOptions(all=False, include_virtual_tests=False, csv=False, platform='test-win-*'), ['passes/text.html'], self.tool)
stdout, _, _ = self.restore_output()
self.assertMultiLineEqual(stdout,
- ('// For test-win-win7\n'
+ ('// For test-win-win10\n'
'passes/text-expected.png\n'
'passes/text-expected.txt\n'
'\n'
- '// For test-win-xp\n'
+ '// For test-win-win7\n'
'passes/text-expected.png\n'
'passes/text-expected.txt\n'))
@@ -152,8 +152,8 @@
command = PrintBaselines()
command.bind_to_tool(self.tool)
self.capture_output()
- command.execute(MockOptions(all=False, platform='*xp', csv=True, include_virtual_tests=False), ['passes/text.html'], self.tool)
+ command.execute(MockOptions(all=False, platform='*win7', csv=True, include_virtual_tests=False), ['passes/text.html'], self.tool)
stdout, _, _ = self.restore_output()
self.assertMultiLineEqual(stdout,
- ('test-win-xp,passes/text.html,None,png,passes/text-expected.png,None\n'
- 'test-win-xp,passes/text.html,None,txt,passes/text-expected.txt,None\n'))
+ ('test-win-win7,passes/text.html,None,png,passes/text-expected.png,None\n'
+ 'test-win-win7,passes/text.html,None,txt,passes/text-expected.txt,None\n'))
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
index b1f76f6..5e5e1a6c 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
@@ -247,7 +247,7 @@
def test_rebaseline_updates_expectations_file_noop(self):
self._zero_out_test_expectations()
- self._write(self.lion_expectations_path, """Bug(B) [ Mac Linux XP Debug ] fast/dom/Window/window-postmessage-clone-really-deep-array.html [ Pass ]
+ self._write(self.lion_expectations_path, """Bug(B) [ Mac Linux Win7 Debug ] fast/dom/Window/window-postmessage-clone-really-deep-array.html [ Pass ]
Bug(A) [ Debug ] : fast/css/large-list-of-rules-crash.html [ Failure ]
""")
self._write("fast/dom/Window/window-postmessage-clone-really-deep-array.html", "Dummy test contents")
@@ -262,7 +262,7 @@
self.WEB_PREFIX + '/userscripts/another-test-actual.wav',
self.WEB_PREFIX + '/userscripts/another-test-actual.txt'])
new_expectations = self._read(self.lion_expectations_path)
- self.assertMultiLineEqual(new_expectations, """Bug(B) [ Mac Linux XP Debug ] fast/dom/Window/window-postmessage-clone-really-deep-array.html [ Pass ]
+ self.assertMultiLineEqual(new_expectations, """Bug(B) [ Mac Linux Win7 Debug ] fast/dom/Window/window-postmessage-clone-really-deep-array.html [ Pass ]
Bug(A) [ Debug ] : fast/css/large-list-of-rules-crash.html [ Failure ]
""")
@@ -298,17 +298,17 @@
# FIXME: it's confusing that this is the test- port, and not the regular win port. Really all of the tests should be using the test ports.
port = self.tool.port_factory.get('test-win-win7')
- self._write(port._filesystem.join(port.layout_tests_dir(), 'platform/test-win-win7/failures/expected/image-expected.txt'), 'original win7 result')
+ self._write(port._filesystem.join(port.layout_tests_dir(), 'platform/test-win-win10/failures/expected/image-expected.txt'), 'original win10 result')
old_exact_matches = builders._exact_matches
oc = OutputCapture()
try:
builders._exact_matches = {
- "MOCK XP": {"port_name": "test-win-xp"},
"MOCK Win7": {"port_name": "test-win-win7"},
+ "MOCK Win10": {"port_name": "test-win-win10"},
}
- options = MockOptions(optimize=True, builder="MOCK Win7", suffixes="txt",
+ options = MockOptions(optimize=True, builder="MOCK Win10", suffixes="txt",
verbose=True, test="failures/expected/image.html", results_directory=None)
oc.capture_output()
@@ -317,9 +317,9 @@
out, _, _ = oc.restore_output()
builders._exact_matches = old_exact_matches
- self.assertMultiLineEqual(self._read(self.tool.filesystem.join(port.layout_tests_dir(), 'platform/test-win-win7/failures/expected/image-expected.txt')), 'MOCK Web result, convert 404 to None=True')
- self.assertFalse(self.tool.filesystem.exists(self.tool.filesystem.join(port.layout_tests_dir(), 'platform/test-win-xp/failures/expected/image-expected.txt')))
- self.assertMultiLineEqual(out, '{"add": [], "remove-lines": [{"test": "failures/expected/image.html", "builder": "MOCK Win7"}], "delete": []}\n')
+ self.assertMultiLineEqual(self._read(self.tool.filesystem.join(port.layout_tests_dir(), 'platform/test-win-win10/failures/expected/image-expected.txt')), 'MOCK Web result, convert 404 to None=True')
+ self.assertFalse(self.tool.filesystem.exists(self.tool.filesystem.join(port.layout_tests_dir(), 'platform/test-win-win7/failures/expected/image-expected.txt')))
+ self.assertMultiLineEqual(out, '{"add": [], "remove-lines": [{"test": "failures/expected/image.html", "builder": "MOCK Win10"}], "delete": []}\n')
class TestAbstractParallelRebaselineCommand(_BaseTestCase):
@@ -329,14 +329,14 @@
old_exact_matches = builders._exact_matches
try:
builders._exact_matches = {
- "MOCK XP": {"port_name": "test-win-xp"},
+ "MOCK Win10": {"port_name": "test-win-win10"},
"MOCK Win7": {"port_name": "test-win-win7"},
"MOCK Win7 (dbg)(1)": {"port_name": "test-win-win7"},
"MOCK Win7 (dbg)(2)": {"port_name": "test-win-win7"},
}
- builders_to_fetch = self.command._builders_to_fetch_from(["MOCK XP", "MOCK Win7 (dbg)(1)", "MOCK Win7 (dbg)(2)", "MOCK Win7"])
- self.assertEqual(builders_to_fetch, ["MOCK XP", "MOCK Win7"])
+ builders_to_fetch = self.command._builders_to_fetch_from(["MOCK Win10", "MOCK Win7 (dbg)(1)", "MOCK Win7 (dbg)(2)", "MOCK Win7"])
+ self.assertEqual(builders_to_fetch, ["MOCK Win7", "MOCK Win10"])
finally:
builders._exact_matches = old_exact_matches
@@ -1294,7 +1294,7 @@
])
self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
-Bug(foo) [ Linux Mac XP ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
+Bug(foo) [ Linux Mac Win10 ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
""")
finally:
builders._exact_matches = old_exact_matches
@@ -1356,7 +1356,7 @@
])
self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
-Bug(foo) [ Linux Mac XP ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
+Bug(foo) [ Linux Mac Win10 ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
""")
finally:
builders._exact_matches = old_exact_matches
