Skip CSP 1.1 tests on ports where it's disabled.

https://bugs.webkit.org/show_bug.cgi?id=90564

Patch by Mike West <mkwst@chromium.org> on 2012-07-04
Reviewed by Adam Barth.

* platform/efl/Skipped:
* platform/mac/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:
* platform/wincairo/Skipped:
* platform/wk2/Skipped:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3f743b3..172dff6 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-04  Mike West  <mkwst@chromium.org>
+
+        Skip CSP 1.1 tests on ports where it's disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=90564
+
+        Reviewed by Adam Barth.
+
+        * platform/efl/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+        * platform/wincairo/Skipped:
+        * platform/wk2/Skipped:
+
 2012-07-04  Li Yin  <li.yin@intel.com>
 
         AudioNode test should cover numberOfInputs and numberOfOutputs of AudioDestinationNode

diff --git a/LayoutTests/platform/efl/Skipped b/LayoutTests/platform/efl/Skipped
index 4a4e09d..f5345b0 100644 (file)
--- a/LayoutTests/platform/efl/Skipped
+++ b/LayoutTests/platform/efl/Skipped
@@ -737,6 +737,10 @@ http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html
 # Tests for features under development
 # ------------------------------------
 
+# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
+# https://bugs.webkit.org/show_bug.cgi?id=85558
+http/tests/security/contentSecurityPolicy/1.1
+
 # ENABLE_INPUT_TYPE_* are not enabled.
 # https://bugs.webkit.org/show_bug.cgi?id=29359
 # https://bugs.webkit.org/show_bug.cgi?id=68971

diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 869dbba..7a67147 100644 (file)
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -262,6 +262,10 @@ http/tests/misc/webtiming-ssl.php
 http/tests/misc/webtiming-two-redirects.php
 fast/performance/
 
+# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
+# https://bugs.webkit.org/show_bug.cgi?id=85558
+http/tests/security/contentSecurityPolicy/1.1
+
 # Still working out flakiness issues with the perf tests.
 # https://bugs.webkit.org/show_bug.cgi?id=44199
 perf/

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2e81bc4..014c299 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -442,6 +442,10 @@ fast/events/page-visibility-transition-test.html
 # No CORS support for media elements is implemented yet.
 http/tests/security/video-cross-origin-readback.html
 
+# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
+# https://bugs.webkit.org/show_bug.cgi?id=85558
+http/tests/security/contentSecurityPolicy/1.1
+
 # =========================================================================== #
 #       Drag and Drop Support in DRT.                                         #
 # =========================================================================== #

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index f39720b..d9ff3ad 100644 (file)
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -1945,3 +1945,7 @@ svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context.svg
 svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context.svg
 svg/W3C-SVG-1.1-SE/linking-uri-01-b.svg
 svg/W3C-SVG-1.1-SE/text-intro-05-t.svg
+
+# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
+# https://bugs.webkit.org/show_bug.cgi?id=85558
+http/tests/security/contentSecurityPolicy/1.1

diff --git a/LayoutTests/platform/wincairo/Skipped b/LayoutTests/platform/wincairo/Skipped
index f057831..6f8eef6 100644 (file)
--- a/LayoutTests/platform/wincairo/Skipped
+++ b/LayoutTests/platform/wincairo/Skipped
@@ -2121,3 +2121,7 @@ editing/undomanager
 
 # https://bugs.webkit.org/show_bug.cgi?id=86000
 http/tests/security/referrer-policy-redirect-link.html
+
+# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
+# https://bugs.webkit.org/show_bug.cgi?id=85558
+http/tests/security/contentSecurityPolicy/1.1

diff --git a/LayoutTests/platform/wk2/Skipped b/LayoutTests/platform/wk2/Skipped
index 0ad08e9..e493e0a 100644 (file)
--- a/LayoutTests/platform/wk2/Skipped
+++ b/LayoutTests/platform/wk2/Skipped
@@ -1058,6 +1058,10 @@ editing/inserting/typing-space-to-trigger-smart-link.html
 # No CORS support for media elements is implemented yet.
 http/tests/security/video-cross-origin-readback.html
 
+# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
+# https://bugs.webkit.org/show_bug.cgi?id=85558
+http/tests/security/contentSecurityPolicy/1.1
+
 ### END OF (2) Classified failures without bug reports (yet)
 ########################################