Add a mac-wk1 platform directory and TestExpectations file
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2014 19:29:39 +0000 (19:29 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2014 19:29:39 +0000 (19:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=128676

Reviewed by Alexey Proskuryakov.

Tools:

* Scripts/webkitpy/port/mac.py:
(MacPort.default_baseline_search_path): When running WK1 tests on Mac,
  make mac-wk1 be the frontmost search path.

LayoutTests:

* platform/mac-wk1/TestExpectations: Added. Skip IndexedDB here.
* platform/mac-wk2/TestExpectations: Manage all mac-wk2 IndexedDB expectations here
  instead of building off the default mac expectations.
* platform/mac/TestExpectations: Don’t skip IndexedDB here.

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

LayoutTests/ChangeLog
LayoutTests/platform/mac-wk1/TestExpectations [new file with mode: 0644]
LayoutTests/platform/mac-wk2/TestExpectations
LayoutTests/platform/mac/TestExpectations
Tools/ChangeLog
Tools/Scripts/webkitpy/port/mac.py

index 0802c17..74cb205 100644 (file)
@@ -1,5 +1,17 @@
 2014-02-12  Brady Eidson  <beidson@apple.com>
 
+        Add a mac-wk1 platform directory and TestExpectations file
+        https://bugs.webkit.org/show_bug.cgi?id=128676
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/mac-wk1/TestExpectations: Added. Skip IndexedDB here.
+        * platform/mac-wk2/TestExpectations: Manage all mac-wk2 IndexedDB expectations here
+          instead of building off the default mac expectations.
+        * platform/mac/TestExpectations: Don’t skip IndexedDB here.
+
+2014-02-12  Brady Eidson  <beidson@apple.com>
+
         IDB: Reimport storage/indexeddb tests from Blink
         https://bugs.webkit.org/show_bug.cgi?id=128636
 
diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
new file mode 100644 (file)
index 0000000..e03675a
--- /dev/null
@@ -0,0 +1,7 @@
+# IndexedDB is not yet enabled in Mac WK1
+storage/indexeddb
+http/tests/security/cross-origin-indexeddb-allowed.html
+http/tests/security/cross-origin-indexeddb.html
+http/tests/security/cross-origin-worker-indexeddb-allowed.html
+http/tests/security/cross-origin-worker-indexeddb.html
+http/tests/security/no-indexeddb-from-sandbox.html
index de7e75b..f59c75b 100644 (file)
@@ -469,9 +469,17 @@ fast/forms/color/input-color-onchange-event.html [ Pass ]
 # This test times out in WebKit1 only.
 fullscreen/anonymous-block-merge-crash.html [ Pass ]
 
-# All IndexedDB tests are skipped in WK1.
-# Until we have a WK1 specific skipped file that WK2 doesn't inherit from,
-# we'll reenable individual tests that are known to pass.
+# Right now, more IndexedDB tests fail than pass.
+# So we'll disable the entire directory...
+storage/indexeddb
+http/tests/security/cross-origin-indexeddb-allowed.html
+http/tests/security/cross-origin-indexeddb.html
+http/tests/security/cross-origin-worker-indexeddb-allowed.html
+http/tests/security/cross-origin-worker-indexeddb.html
+http/tests/security/no-indexeddb-from-sandbox.html
+
+# ...and then re-enable known-passing tests.
+# Eventually we can show only failing tests, and hopefully get rid of this section altogether.
 storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]
 storage/indexeddb/mozilla/autoincrement-indexes.html [ Pass ]
 storage/indexeddb/mozilla/bad-keypath.html [ Pass ]
index 753befa..cea87d2 100644 (file)
@@ -131,14 +131,6 @@ canvas/philip/tests/2d.composite.operation.darker.html
 # exceptions that were previously expected
 canvas/philip/tests/2d.drawImage.outsidesource.html
 
-# IndexedDB is not yet enabled.
-storage/indexeddb
-http/tests/security/cross-origin-indexeddb-allowed.html
-http/tests/security/cross-origin-indexeddb.html
-http/tests/security/cross-origin-worker-indexeddb-allowed.html
-http/tests/security/cross-origin-worker-indexeddb.html
-http/tests/security/no-indexeddb-from-sandbox.html
-
 # This port doesn't support DeviceMotion or DeviceOrientation.
 fast/dom/DeviceMotion
 fast/dom/DeviceOrientation
index 25aed52..8992a31 100644 (file)
@@ -1,3 +1,14 @@
+2014-02-12  Brady Eidson  <beidson@apple.com>
+
+        Add a mac-wk1 platform directory and TestExpectations file
+        https://bugs.webkit.org/show_bug.cgi?id=128676
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.default_baseline_search_path): When running WK1 tests on Mac,
+          make mac-wk1 be the frontmost search path.
+
 2014-02-11  Oliver Hunt  <oliver@apple.com>
 
         Make it possible to implement JS builtins in JS
index 4bfd946..929b079 100644 (file)
@@ -84,6 +84,8 @@ class MacPort(ApplePort):
             fallback_names = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(name):-1] + [self.port_name]
         if self.get_option('webkit_test_runner'):
             fallback_names = [self._wk2_port_name(), 'wk2'] + fallback_names
+        else:
+            fallback_names = ['mac-wk1'] + fallback_names
         return map(self._webkit_baseline_path, fallback_names)
 
     def _port_specific_expectations_files(self):