summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 18:13:44 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 18:13:44 +0000
commitbec2c9fbba00e66bf5b13c59d021a0aa4d03427b (patch)
treef59faaafe1665927aa169c88d93a9dedcf95005e /webkit
parent230edecee94572003a6969c10a6fffcd0a9876a3 (diff)
downloadchromium_src-bec2c9fbba00e66bf5b13c59d021a0aa4d03427b.zip
chromium_src-bec2c9fbba00e66bf5b13c59d021a0aa4d03427b.tar.gz
chromium_src-bec2c9fbba00e66bf5b13c59d021a0aa4d03427b.tar.bz2
One more try, this time with feeling.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 50c23fb..fdb8e15 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2805,7 +2805,8 @@ BUG16690 SKIP MAC : LayoutTests/fast/text/international/khmer-selection.html = F
// WebKit merge 42738:45840
// New tests, need baseline.
BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-null-char.html = FAIL
-BUG16240 MAC WIN SLOW : LayoutTests/http/tests/cache/subresource-expiration.html = PASS
+BUG16240 WIN SLOW : LayoutTests/http/tests/cache/subresource-expiration.html = PASS
+BUG16240 MAC : LayoutTests/http/tests/cache/subresource-expiration.html = PASS TIMEOUT
// Failing due to r20652.
BUG16779 BUG16742 : LayoutTests/media/video-error-abort.html = FAIL CRASH