diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-14 20:19:59 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-14 20:19:59 +0000 |
| commit | 600713a72483b9cd8698a34e86a017c3a90a4c7b (patch) | |
| tree | da715346dcc2d9036a2a3af8eee9e8b81df3d9f8 /webkit | |
| parent | 70d9a81feb73046e345076f3ed9b19acf7c68c68 (diff) | |
| download | chromium_src-600713a72483b9cd8698a34e86a017c3a90a4c7b.zip chromium_src-600713a72483b9cd8698a34e86a017c3a90a4c7b.tar.gz chromium_src-600713a72483b9cd8698a34e86a017c3a90a4c7b.tar.bz2 | |
Shard the http tests on linux as well. They seem to be just
as stable as on the mac now. Sharding the http tests on the mac
did *not* increase flakiness at all.
Also, update comment for a test in test_expectations.
Review URL: http://codereview.chromium.org/494010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 8 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 359b2ff..57f10b5 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -153,9 +153,11 @@ class TestRunner: self._shardable_directories = ['chrome', 'LayoutTests', 'pending', 'fast', 'svg'] - # The http tests are very stable on the mac. Experiment with sharding - # the http directories to see if it considerably increases flakiness. - if sys.platform == 'darwin': + # The http tests are very stable on mac/linux. + # TODO(ojan): Make the http server on Windows be apache so we can turn + # shard the http tests there as well. Switching to apache is what made them + # stable on linux/mac. + if sys.platform in ('darwin', 'linux2'): self._shardable_directories.extend(['http', 'tests']) self._websocket_server = websocket_server.PyWebSocket( diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index e379bcf..7ff47e4 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2487,7 +2487,6 @@ BUG9798 SLOW LINUX RELEASE : LayoutTests/transitions/transition-timing-function. BUG9798 MAC WIN RELEASE : LayoutTests/http/tests/xmlhttprequest/small-chunks-response-text.html = PASS TIMEOUT BUG9798 SLOW LINUX RELEASE : LayoutTests/http/tests/xmlhttprequest/small-chunks-response-text.html = PASS BUG9798 MAC RELEASE : LayoutTests/http/tests/xmlhttprequest/web-apps/003.html = PASS TIMEOUT -BUG9798 LINUX DEBUG : LayoutTests/http/tests/multipart/invalid-image-data.html = PASS IMAGE BUG9798 LINUX DEBUG : LayoutTests/fast/forms/listbox-scroll-after-options-removed.html = CRASH PASS BUG9798 LINUX DEBUG : LayoutTests/fast/multicol/float-multicol.html = IMAGE PASS BUG9798 LINUX WIN DEBUG : LayoutTests/svg/custom/js-update-transform-addition.svg = CRASH PASS @@ -2498,6 +2497,10 @@ BUG9798 LINUX : LayoutTests/svg/custom/js-update-transform-changes.svg = FAIL BUG9798 WIN DEBUG : LayoutTests/http/tests/loading/redirect-methods.html = TIMEOUT PASS BUG9798 MAC DEBUG : LayoutTests/plugins/geturl-replace-query.html = TEXT PASS +// This test got considerably more flaky when we switched from lighttpd to +// apache on the linux bots. +BUG9798 LINUX DEBUG : LayoutTests/http/tests/multipart/invalid-image-data.html = PASS IMAGE + // New tests or failures from WebKit merge 42324:42364. Re-baselined on // Windows. Probably just need the same on other platforms. BUG9962 LINUX : LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug.html = FAIL |