diff options
Diffstat (limited to 'webkit')
20 files changed, 15 insertions, 246 deletions
diff --git a/webkit/data/layout_tests/chrome/fast/dom/messageport-gc-expected.txt b/webkit/data/layout_tests/chrome/fast/dom/messageport-gc-expected.txt deleted file mode 100644 index 90845ac..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/messageport-gc-expected.txt +++ /dev/null @@ -1,4 +0,0 @@ -ALERT: port1 -ALERT: from port2 -ALERT: port2 -ALERT: from port1 diff --git a/webkit/data/layout_tests/chrome/fast/dom/messageport-gc.html b/webkit/data/layout_tests/chrome/fast/dom/messageport-gc.html deleted file mode 100644 index 0582370..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/messageport-gc.html +++ /dev/null @@ -1,53 +0,0 @@ -<html> - -<script> -var channel; -if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); -} - -function on_message1(evt) { - try { - alert(this.x); - alert(evt.data); - this.postMessage("from port1") - } catch (e) { - document.write(e); - if (window.layoutTestController) - layoutTestController.notifyDone(); - } -} - -function on_message2(evt) { - try { - alert(this.y); - alert(evt.data); - if (window.layoutTestController) - layoutTestController.notifyDone(); - } catch (e) { - document.write(e); - if (window.layoutTestController) - layoutTestController.notifyDone(); - } -} - -function run_test() { - channel = new MessageChannel(); - channel.port1.x = 'port1'; - channel.port2.y = 'port2'; - channel.port1.onmessage = on_message1; - channel.port2.onmessage = on_message2; - channel.port2.postMessage('from port2'); - channel.port1.start(); - channel.port2.start(); - channel = null; - if (window.GCController) { - window.GCController.collect(); - } -} - -</script> -<body onload='run_test()'> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/http/tests/plugins/get-file-url-expected.txt b/webkit/data/layout_tests/chrome/http/tests/plugins/get-file-url-expected.txt deleted file mode 100644 index 1cb233c..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/plugins/get-file-url-expected.txt +++ /dev/null @@ -1,25 +0,0 @@ -CONSOLE MESSAGE: line 0: Not allowed to load local resource: cmd.exe -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (8,8) size 784x584 - RenderBlock (anonymous) at (0,0) size 784x150 - RenderPartObject {EMBED} at (0,0) size 300x150 - RenderBlock {P} at (0,166) size 784x18 - RenderText {#text} at (0,0) size 691x18 - text run at (0,0) width 691: "This tests that http URLs with plugins cannot access file URLs via the plugin. (Tests the NPN_GetURL API)" - RenderBlock {DIV} at (0,200) size 784x18 - RenderText {#text} at (0,0) size 71x18 - text run at (0,0) width 71: "SUCCESS" - RenderBlock (anonymous) at (0,218) size 784x154 - RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)] - layer at (0,0) size 300x150 - RenderView at (0,0) size 300x150 - layer at (0,0) size 300x8 - RenderBlock {HTML} at (0,0) size 300x8 - RenderBody {BODY} at (8,8) size 284x0 - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/chrome/http/tests/plugins/get-file-url.html b/webkit/data/layout_tests/chrome/http/tests/plugins/get-file-url.html deleted file mode 100644 index d29a3cb..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/plugins/get-file-url.html +++ /dev/null @@ -1,50 +0,0 @@ -<html> -<body> -<embed id="plg" type="application/x-webkit-test-netscape"></embed><P> - -This tests that http URLs with plugins cannot access file URLs -via the plugin. (Tests the NPN_GetURL API) - -<div id="result"></div> -<iframe name="output" id="output"></iframe> - -<script> -var NPERR_NO_ERROR = 0; - -function callback(result) { - // If we get a callback, then webkit attempted to load - // the file. - var result = document.getElementById("result"); - result.innerHTML = "FAILED - unexpected result " + result; - layoutTestController.notifyDone(); -} - -function checkresults() { - var result = document.getElementById("result"); - var output = document.getElementById("output"); - if (output.innerHTML == "") { - result.innerHTML = "SUCCESS"; - } else { - result.innerHTML = "FAILED - content was loaded!"; - } - layoutTestController.notifyDone(); -} - -function runtest() { - // Which file URL we attempt to load doesn't matter, - // and it doesn't even matter if the file exists. - // Webkit should block the load entirely. If we get - // a callback on it - success or failure - then webkit - // attempted to load. - var subfile = "file:///c:/windows/system32/cmd.exe"; - var plg = document.getElementById("plg"); - plg.getURLNotify(subfile, "output", "callback()"); - setTimeout("checkresults()", 500); -} - -layoutTestController.waitUntilDone(); -runtest(); -</script> -</body> -</html> - diff --git a/webkit/data/layout_tests/pending/README b/webkit/data/layout_tests/pending/README deleted file mode 100644 index 3fbefca..0000000 --- a/webkit/data/layout_tests/pending/README +++ /dev/null @@ -1,9 +0,0 @@ -If you add a test to this directory, please edit or add a README file in the -same directory as your test explaining why it was forked (or that it's new) -and mentioning any applicable internal or WebKit bugs. - -The original versions of tests that have been forked into this directory -should be added to tests_fixable.txt so we keep track of the need to send -them upstream and then remove these copies. Mark them as DEFER if possible, -or SKIP if running them causes problems with other tests. - diff --git a/webkit/data/layout_tests/pending/fast/dom/README b/webkit/data/layout_tests/pending/fast/dom/README deleted file mode 100644 index 388063f..0000000 --- a/webkit/data/layout_tests/pending/fast/dom/README +++ /dev/null @@ -1 +0,0 @@ -NamedNodeMap-setNamedItem-crash.html from webkit trunk, r33023, for b/1159092. diff --git a/webkit/data/layout_tests/pending/fast/repaint/README b/webkit/data/layout_tests/pending/fast/repaint/README deleted file mode 100644 index e17aa5f..0000000 --- a/webkit/data/layout_tests/pending/fast/repaint/README +++ /dev/null @@ -1,2 +0,0 @@ -bugzilla-6473.html: The original version has a timer race that's exposed with -our new timer code. See bug 972450. diff --git a/webkit/data/layout_tests/pending/fast/repaint/bugzilla-6473.html b/webkit/data/layout_tests/pending/fast/repaint/bugzilla-6473.html deleted file mode 100644 index 1306053..0000000 --- a/webkit/data/layout_tests/pending/fast/repaint/bugzilla-6473.html +++ /dev/null @@ -1,39 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> -<html lang="en"> -<head> -<script src="repaint.js"></script> -<script type="text/javascript"> -function finish() -{ - document.getElementById('allcontent').style.overflow = ''; - if (layoutTestController) { - layoutTestController.notifyDone(); - } -} - -function repaintTest() -{ - window.setTimeout(finish, 1); -} -</script> -</head> -<body onload="runRepaintTest()"> -<p><b>BUG ID:</b> <a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=6473">Bugzilla bug 6473</a> REGRESSION: Serious painting problems on new iLife and iWorks pages</p> - -<p id="success" style="background-color:palegreen; padding:3px;"><b>TEST PASS:</b> -A green rectangle containing the word SUCCESS will show below. -</p> - -<p id="failure" style="background-color:#FF3300; padding:3px;"><b>TEST FAIL:</b> -A green rectangle will not show below. -</p> -<div> -<div id="allcontent" style="overflow: auto;"> -<p style="position: relative; background: lime;"> - SUCCESS -</p> -</div> -</div> -</body> -</html> diff --git a/webkit/data/layout_tests/pending/fast/repaint/repaint.js b/webkit/data/layout_tests/pending/fast/repaint/repaint.js deleted file mode 100644 index fd232ab..0000000 --- a/webkit/data/layout_tests/pending/fast/repaint/repaint.js +++ /dev/null @@ -1,11 +0,0 @@ -function runRepaintTest() -{ - if (window.layoutTestController) { - layoutTestController.waitUntilDone(); - document.body.offsetTop; - layoutTestController.display(); - repaintTest(); - } else { - setTimeout(repaintTest, 0); - } -} diff --git a/webkit/data/layout_tests/pending/plugins/README b/webkit/data/layout_tests/pending/plugins/README deleted file mode 100644 index 6299fd5..0000000 --- a/webkit/data/layout_tests/pending/plugins/README +++ /dev/null @@ -1,2 +0,0 @@ -destroy-stream-twice.html: Bug 982608: corrected expected output of one -tested condition, and added a timeout check. diff --git a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.checksum new file mode 100644 index 0000000..a1d10e8 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.checksum @@ -0,0 +1 @@ +01afa2ed766a30ad8b29cdeb1f42b1b9
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.png b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.png Binary files differnew file mode 100644 index 0000000..7603565 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.png diff --git a/webkit/tools/layout_tests/layout_package/failure.py b/webkit/tools/layout_tests/layout_package/failure.py index 91abfa7f..f25cc31 100644 --- a/webkit/tools/layout_tests/layout_package/failure.py +++ b/webkit/tools/layout_tests/layout_package/failure.py @@ -95,8 +95,7 @@ class Failure(object): return self.test_path[0:last_index] + suffix def GetTestHome(self): - if (self.test_path.startswith("chrome") or - self.test_path.startswith("pending")): + if self.test_path.startswith("chrome"): return CHROMIUM_TRAC_HOME + self.test_path return WEBKIT_TRAC_HOME + self.test_path diff --git a/webkit/tools/layout_tests/layout_package/failure_finder.py b/webkit/tools/layout_tests/layout_package/failure_finder.py index 8fb4d14..800aec8 100644 --- a/webkit/tools/layout_tests/layout_package/failure_finder.py +++ b/webkit/tools/layout_tests/layout_package/failure_finder.py @@ -665,7 +665,7 @@ class FailureFinder(object): def _AddBaselineURLs(self, list, base_url, platforms): # If the base URL doesn't contain any platform in its path, only add the - # base URL to the list. This happens with the chrome/ and pending/ dirs. + # base URL to the list. This happens with the chrome/ dir. if base_url.find("%s") == -1: list.append(base_url) return @@ -686,7 +686,7 @@ class FailureFinder(object): reduced_filename = filename.replace("LayoutTests/", "") chromium_platform_url = LAYOUT_TEST_REPO_BASE_URL - if not filename.startswith("chrome") and not filename.startswith("pending"): + if not filename.startswith("chrome"): chromium_platform_url += "platform/%s/" chromium_platform_url += filename diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py index 23ef22a..f5fe02a 100755 --- a/webkit/tools/layout_tests/layout_package/http_server.py +++ b/webkit/tools/layout_tests/layout_package/http_server.py @@ -51,13 +51,6 @@ class Lighttpd(http_server_base.HttpServerBase): _webkit_tests = None _js_test_resource = None - # New tests for Chrome - try: - _pending_tests = path_utils.PathFromBase('webkit', 'data', 'layout_tests', - 'pending', 'http', 'tests') - except path_utils.PathNotFound: - _pending_tests = None - # Path where we can access all of the tests _all_tests = path_utils.PathFromBase('webkit', 'data', 'layout_tests') # Self generated certificate for SSL server (for client cert get @@ -76,14 +69,6 @@ class Lighttpd(http_server_base.HttpServerBase): {'port': 8080, 'docroot': _webkit_tests}, {'port': 8443, 'docroot': _webkit_tests, 'sslcert': _pem_file}] ) - if _pending_tests: - VIRTUALCONFIG.extend( - # Three similar mappings (one with SSL enabled) for pending http tests - [{'port': 9000, 'docroot': _pending_tests}, - {'port': 9080, 'docroot': _pending_tests}, - {'port': 9443, 'docroot': _pending_tests, 'sslcert': _pem_file}] - ) - def __init__(self, output_dir, background=False, port=None, root=None, register_cygwin=None, run_background=None): diff --git a/webkit/tools/layout_tests/layout_package/json_results_generator.py b/webkit/tools/layout_tests/layout_package/json_results_generator.py index 1f72414..fac8a29 100644 --- a/webkit/tools/layout_tests/layout_package/json_results_generator.py +++ b/webkit/tools/layout_tests/layout_package/json_results_generator.py @@ -124,10 +124,10 @@ class JSONResultsGenerator: """Returns the path of the test relative to the layout test root. Example paths are src/third_party/WebKit/LayoutTests/fast/forms/foo.html - src/webkit/data/layout_tests/pending/fast/forms/foo.html + src/webkit/data/layout_tests/chrome/fast/forms/foo.html We would return the following: LayoutTests/fast/forms/foo.html - pending/fast/forms/foo.html + chrome/fast/forms/foo.html """ index = test.find(self.WEBKIT_PATH) if index is not -1: diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py index 7099df2..42aae30 100644 --- a/webkit/tools/layout_tests/layout_package/path_utils.py +++ b/webkit/tools/layout_tests/layout_package/path_utils.py @@ -102,9 +102,9 @@ def ExpectedBaseline(filename, suffix, platform=None, all_baselines=False): global _search_path_platform testname = os.path.splitext(RelativeTestFilename(filename))[0] - # While we still have tests in LayoutTests/, chrome/, and pending/, we need + # While we still have tests in both LayoutTests/ and chrome/ we need # to strip that outer directory. - # TODO(pamg): Once we upstream all of chrome/ and pending/, clean this up. + # TODO(pamg): Once we upstream all of chrome/, clean this up. platform_filename = testname + '-expected' + suffix testdir, base_filename = platform_filename.split('/', 1) @@ -122,8 +122,7 @@ def ExpectedBaseline(filename, suffix, platform=None, all_baselines=False): foundCurrentPlatform = True if foundCurrentPlatform: - # TODO(pamg): Clean this up once we upstream everything in chrome/ and - # pending/. + # TODO(pamg): Clean this up once we upstream everything in chrome/. if os.path.basename(platform_dir).startswith('chromium'): if os.path.exists(os.path.join(platform_dir, platform_filename)): baselines.append((platform_dir, platform_filename)) @@ -183,7 +182,6 @@ def FilenameToUri(full_path): """Convert a test file to a URI.""" LAYOUTTESTS_DIR = "LayoutTests/" LAYOUTTEST_HTTP_DIR = "LayoutTests/http/tests/" - PENDING_HTTP_DIR = "pending/http/tests/" LAYOUTTEST_WEBSOCKET_DIR = "LayoutTests/websocket/tests/" relative_path = _WinPathToUnix(RelativeTestFilename(full_path)) @@ -194,10 +192,6 @@ def FilenameToUri(full_path): # LayoutTests/http/tests/ run off port 8000 and ssl/ off 8443 relative_path = relative_path[len(LAYOUTTEST_HTTP_DIR):] port = 8000 - elif relative_path.startswith(PENDING_HTTP_DIR): - # pending/http/tests/ run off port 9000 and ssl/ off 9443 - relative_path = relative_path[len(PENDING_HTTP_DIR):] - port = 9000 elif relative_path.startswith(LAYOUTTEST_WEBSOCKET_DIR): # LayoutTests/websocket/tests/ run off port 8880 and 9323 # Note: the root is LayoutTests/, not LayoutTests/websocket/tests/ diff --git a/webkit/tools/layout_tests/layout_package/test_files.py b/webkit/tools/layout_tests/layout_package/test_files.py index c94cd5b..f4f0b5c 100644 --- a/webkit/tools/layout_tests/layout_package/test_files.py +++ b/webkit/tools/layout_tests/layout_package/test_files.py @@ -21,7 +21,7 @@ _supported_file_extensions = set(['.html', '.shtml', '.xml', '.xhtml', '.pl', _skipped_directories = set(['.svn', '_svn', 'resources', 'script-tests']) # Top-level directories to shard when running tests. -ROOT_DIRECTORIES = set(['chrome', 'LayoutTests', 'pending']) +ROOT_DIRECTORIES = set(['chrome', 'LayoutTests']) def GatherTestFiles(paths): """Generate a set of test files and return them. diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index c19e524..aaa9e1a 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -158,7 +158,7 @@ class TestRunner: else: self._http_server = http_server.Lighttpd(options.results_directory) - self._shardable_directories = ['chrome', 'LayoutTests', 'pending', 'fast', + self._shardable_directories = ['chrome', 'LayoutTests', 'fast', 'svg', 'loader', 'editing'] # The http tests are very stable on mac/linux. @@ -1385,7 +1385,7 @@ def main(options, args): if options.clobber_old_results: # Just clobber the actual test results directories since the other files # in the results directory are explicitly used for cross-run tracking. - test_dirs = ("LayoutTests", "chrome", "pending") + test_dirs = ("LayoutTests", "chrome") for directory in test_dirs: path = os.path.join(options.results_directory, directory) if os.path.exists(path): diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 5722ff0..a971a56 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -178,7 +178,6 @@ WONTFIX SKIP : LayoutTests/fast/events/message-port-no-wrapper.html = FAIL WONTFIX SKIP : LayoutTests/fast/events/message-port.html = FAIL WONTFIX SKIP : LayoutTests/fast/events/message-port-multi.html = FAIL WONTFIX SKIP : LayoutTests/http/tests/security/MessagePort/event-listener-context.html = FAIL -WONTFIX SKIP : chrome/fast/dom/messageport-gc.html = FAIL // Chrome does not support WebArchives (just like Safari for Windows), // although we might eventually want to on Mac. @@ -456,9 +455,6 @@ WONTFIX : LayoutTests/editing/selection/click-before-and-after-table.html = FAIL // whether we create a window via a plugin when target is _blank. BUG24186 WONTFIX SKIP : LayoutTests/plugins/get-url-with-blank-target.html = FAIL -// This test doesn't work on the bbot. Works locally. -WONTFIX SKIP : chrome/http/tests/plugins/get-file-url.html = FAIL PASS TIMEOUT - // Dashboard-related test WONTFIX SKIP : LayoutTests/platform/mac/fast/css/dashboard-region-parser.html = FAIL @@ -577,10 +573,9 @@ BUG24203 : LayoutTests/fast/events/stopPropagation-submit.html = FAIL // ----------------------------------------------------------------- // These tests don't work with fast timers due to setTimeout -// races. Pending versions have these fixed. -// Upstreaming pending test needs work. -// See https://bugs.webkit.org/show_bug.cgi?id=21536 +// races. See https://bugs.webkit.org/show_bug.cgi?id=21536 BUG24195 WIN LINUX : LayoutTests/fast/repaint/bugzilla-6473.html = IMAGE+TEXT +BUG24195 MAC : LayoutTests/fast/repaint/bugzilla-6473.html = IMAGE // ----------------------------------------------------------------- // Tests deferred until we provide support for a particular feature. @@ -615,8 +610,6 @@ BUG8630 LINUX WIN DEBUG : LayoutTests/fast/overflow/hidden-scrollbar-resize.html BUG8630 WIN LINUX RELEASE : LayoutTests/fast/reflections/inline-crash.html = FAIL BUG8630 LINUX WIN DEBUG : LayoutTests/fast/reflections/inline-crash.html = FAIL BUG8630 WIN LINUX : LayoutTests/fast/text/font-initial.html = FAIL -BUG8630 WIN LINUX RELEASE : pending/fast/repaint/bugzilla-6473.html = FAIL -BUG8630 LINUX WIN DEBUG : pending/fast/repaint/bugzilla-6473.html = FAIL BUG8630 LINUX : LayoutTests/svg/custom/use-detach.svg = FAIL PASS BUG18772 LINUX : LayoutTests/fast/backgrounds/001.html = FAIL @@ -2061,7 +2054,6 @@ BUG23473 MAC : LayoutTests/fast/repaint/list-marker.html = PASS BUG23473 MAC WIN : LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html = IMAGE+TEXT PASS BUG23473 MAC : LayoutTests/fast/repaint/table-cell-vertical-overflow.html = PASS BUG23473 MAC : LayoutTests/fast/repaint/text-shadow.html = PASS -BUG23473 MAC : pending/fast/repaint/bugzilla-6473.html = IMAGE BUG23473 MAC : LayoutTests/fast/repaint/fixed.html = PASS BUG23473 MAC : LayoutTests/fast/repaint/flexible-box-overflow-horizontal.html = PASS BUG23473 MAC : LayoutTests/fast/repaint/layer-outline-horizontal.html = PASS @@ -2486,12 +2478,6 @@ BUG14832 : LayoutTests/editing/selection/user-drag-element-and-user-select-none. // WebKit 44928:44943 BUG14946 : LayoutTests/fast/js/date-toisostring.html = FAIL -// WebKit 44969:45017 - -// The Mac layout test buildbots haven't generated a package for 20 days so -// the rebaselining tool isn't working for this --agl -BUG15125 MAC SKIP : chrome/fast/text/fake-italic.html = FAIL - // WebKit 45017:45086 BUG15217 : LayoutTests/fast/js/dictionary-no-cache.html = FAIL BUG15217 MAC : LayoutTests/fast/js/switch-behaviour.html = FAIL @@ -3140,4 +3126,4 @@ BUG_JPARENT : LayoutTests/svg/filters/filter-source-position.svg = IMAGE+TEXT BUG_JPARENT : LayoutTests/fast/repaint/backgroundSizeRepaint.html = IMAGE // Flaky since SVG filters turned on -BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS
\ No newline at end of file +BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS |
