summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/pending/security/block-test.html1
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt1
2 files changed, 0 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/pending/security/block-test.html b/webkit/data/layout_tests/pending/security/block-test.html
index e9c9f85..edc1483 100644
--- a/webkit/data/layout_tests/pending/security/block-test.html
+++ b/webkit/data/layout_tests/pending/security/block-test.html
@@ -29,7 +29,6 @@
testIMG.setAttribute("onError", "ftp21Test();");
var newURL = "ftp://" + baseURL + "/test.jpg";
testIMG.src = newURL;
- finishTesting();
}
function ftp21Test() {
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 1ebcf3c..fc4e769 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -982,7 +982,6 @@ DEFER LINUX WIN : LayoutTests/fast/layers/opacity-transforms.html = FAIL
DEFER : LayoutTests/plugins/netscape-construct.html = FAIL
// MERGE 37604:38097 REGRESSIONS
-pending/security/block-test.html = CRASH FAIL
// New test. We should fix it, but it doesn't need to block the current release
DEFER : LayoutTests/http/tests/security/originHeader/origin-header-for-empty.html = FAIL TIMEOUT PASS