Get rid of unneeded TestExpectations files.

* platform/mac-mavericks/TestExpectations: Removed.
* platform/mac-yosemite/TestExpectations: Removed.
* platform/mac/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b73fca20160be4e26a89f3012f3d71a43bbe42b2..3e612d28c9c0eb714747ddbef90bc5190805fd77 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2015-09-04  Alexey Proskuryakov  <ap@apple.com>
+
+        Get rid of unneeded TestExpectations files.
+
+        * platform/mac-mavericks/TestExpectations: Removed.
+        * platform/mac-yosemite/TestExpectations: Removed.
+        * platform/mac/TestExpectations:
+
 2015-09-04  Alexey Proskuryakov  <ap@apple.com>
 
         REGRESSION (r189407): webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html

diff --git a/LayoutTests/platform/mac-mavericks/TestExpectations b/LayoutTests/platform/mac-mavericks/TestExpectations
deleted file mode 100644 (file)
index dfee7c7..0000000
--- a/LayoutTests/platform/mac-mavericks/TestExpectations
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://bugs.webkit.org/show_bug.cgi?id=143258
-http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html
-
-# No support for Filters Level 2
-compositing/media-controls-bar-appearance.html [ Skip ]
-compositing/media-controls-bar-appearance-big.html [ Skip ]
-fast/css/will-change/will-change-creates-stacking-context.html [ ImageOnlyFailure ]
-
-# No support for non-HLS Media Selection Group
-media/accessiblity-describes-video.html [ Skip ]
-
-# Reftests have different expected results in Mavericks and Yosemite
-fast/ruby/ruby-expansion-cjk.html [ ImageOnlyFailure ]
-fast/ruby/ruby-expansion-cjk-2.html [ ImageOnlyFailure ]
-fast/ruby/ruby-expansion-cjk-3.html [ ImageOnlyFailure ]
-fast/ruby/ruby-expansion-cjk-4.html [ ImageOnlyFailure ]
-
-# Colorspaces on CA OpenGL layers not available in Mavericks and Yosemite
-fast/canvas/webgl/match-page-color-space.html [ Skip ]

diff --git a/LayoutTests/platform/mac-yosemite/TestExpectations b/LayoutTests/platform/mac-yosemite/TestExpectations
deleted file mode 100644 (file)
index e7c0c97..0000000
--- a/LayoutTests/platform/mac-yosemite/TestExpectations
+++ /dev/null
@@ -1,2 +0,0 @@
-# Colorspaces on CA OpenGL layers not available in Mavericks and Yosemite
-fast/canvas/webgl/match-page-color-space.html [ Skip ]

diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index e481fa66146cf448baf3bf5bcbc039740dc82ccd..7132b774f001f120d0b36044497c85cfa4dbf1d5 100644 (file)
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1176,16 +1176,16 @@ webkit.org/b/142142 fullscreen/video-controls-override.html [ Skip ]
 webkit.org/b/142142 http/tests/media/hls/video-controls-live-stream.html [ Skip ]
 webkit.org/b/142142 media/video-volume-slider-drag.html [ Skip ]
 
-# Test uses Yosemite blurs
-[ Mavericks ] compositing/media-controls-bar-appearance.html [ Skip ]
-
 # Mavericks and prior do not support APNG.
 webkit.org/b/17022 [ MountainLion Mavericks ] fast/images/animated-png.html [ Skip ]
 
 # OS X 10.10.3+ has the necessary glyphs.
 webkit.org/b/142548 [ Yosemite+ ] editing/selection/extend-by-character-007.html [ Pass ]
 
-media/accessiblity-describes-video.html [ Pass Failure ]
+# No support for non-HLS Media Selection Group
+[ Mavericks ] media/accessiblity-describes-video.html [ Skip ]
+
+[ Yosemite+ ] media/accessiblity-describes-video.html [ Pass Failure ]
 
 webkit.org/b/145432 media/video-transformed-by-javascript.html [ Failure ]
 
@@ -1251,3 +1251,20 @@ webkit.org/b/148636 inspector/model/parse-script-syntax-tree.html [ Pass Timeout
 webkit.org/b/148636 inspector/model/remote-object-get-properties.html [ Pass Timeout ]
 webkit.org/b/148636 inspector/model/remote-object.html [ Pass Timeout ]
 webkit.org/b/148636 inspector/page/main-frame-resource.html [ Pass Timeout ]
+
+# Resource priorities are not enabled.
+webkit.org/b/143258 [ Mavericks ] http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html [ Skip ]
+
+# No support for Filters Level 2
+[ Mavericks ] compositing/media-controls-bar-appearance.html [ Skip ]
+[ Mavericks ] compositing/media-controls-bar-appearance-big.html [ Skip ]
+[ Mavericks ] fast/css/will-change/will-change-creates-stacking-context.html [ ImageOnlyFailure ]
+
+# Reftests have different expected results in Mavericks and Yosemite
+[ Mavericks ] fast/ruby/ruby-expansion-cjk.html [ ImageOnlyFailure ]
+[ Mavericks ] fast/ruby/ruby-expansion-cjk-2.html [ ImageOnlyFailure ]
+[ Mavericks ] fast/ruby/ruby-expansion-cjk-3.html [ ImageOnlyFailure ]
+[ Mavericks ] fast/ruby/ruby-expansion-cjk-4.html [ ImageOnlyFailure ]
+
+# Colorspaces on CA OpenGL layers not available in Mavericks and Yosemite
+[ Mavericks Yosemite ] fast/canvas/webgl/match-page-color-space.html [ Skip ]