summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorplaymobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-31 17:08:54 +0000
committerplaymobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-31 17:08:54 +0000
commita9419b41faab206d0edcba7a667963eb6947611d (patch)
tree5ca5111f8b64f809fb2b906dd45720e6f7b5a474 /webkit
parentbb7efcdacf84276bbec2d1e9bdd84c021b6d8a1d (diff)
downloadchromium_src-a9419b41faab206d0edcba7a667963eb6947611d.zip
chromium_src-a9419b41faab206d0edcba7a667963eb6947611d.tar.gz
chromium_src-a9419b41faab206d0edcba7a667963eb6947611d.tar.bz2
Fixup lint errors :(
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 87f07f6..3a7e4b8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1526,8 +1526,8 @@ MAC : LayoutTests/fast/loader/local-JavaScript-from-local.html = FAIL
MAC : LayoutTests/fast/loader/local-image-from-local.html = FAIL
// the url comes back wrong, it should have a question mark for args on it.
-MAC : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = FAIL CRASH
-MAC : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = FAIL
+MAC : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT CRASH
+MAC : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT FAIL
// whitespace differences (??)
MAC : LayoutTests/fast/dom/tabindex-clamp.html = FAIL
@@ -2404,8 +2404,6 @@ MAC : LayoutTests/http/tests/navigation/postredirect-goback1.html = FAIL
MAC : LayoutTests/http/tests/navigation/restore-form-state-https.html = FAIL
MAC : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
MAC : LayoutTests/svg/text/text-intro-05-t.svg = FAIL
-MAC : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT
-MAC : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
// Merge WebKit: 42026:42115 new tests
DEFER : LayoutTests/fast/block/positioning/negative-rel-position.html = FAIL