summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 18:10:37 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 18:10:37 +0000
commit230edecee94572003a6969c10a6fffcd0a9876a3 (patch)
tree73108ccedda923021e775bdfd8a57843ca839ff8 /webkit
parent2bbeb40a70d5acbf49cb9a481400128c95f3973f (diff)
downloadchromium_src-230edecee94572003a6969c10a6fffcd0a9876a3.zip
chromium_src-230edecee94572003a6969c10a6fffcd0a9876a3.tar.gz
chromium_src-230edecee94572003a6969c10a6fffcd0a9876a3.tar.bz2
fix duplicate expecations, again
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index f7d0a32..50c23fb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2805,7 +2805,7 @@ 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 TIMEOUT
+BUG16240 MAC WIN SLOW : LayoutTests/http/tests/cache/subresource-expiration.html = PASS
// Failing due to r20652.
BUG16779 BUG16742 : LayoutTests/media/video-error-abort.html = FAIL CRASH