diff options
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 33 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 |
2 files changed, 19 insertions, 21 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 8b0af0e..31296cd 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -815,25 +815,20 @@ def main(options, args): platform_new_results_dir = options.platform if not options.num_test_shells: - # Only run stable configurations with multiple test_shells by default. - if options.target == 'Release': - cpus = 1 - if sys.platform in ('win32', 'cygwin'): - cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) - elif (hasattr(os, "sysconf") and - os.sysconf_names.has_key("SC_NPROCESSORS_ONLN")): - # Linux & Unix: - ncpus = os.sysconf("SC_NPROCESSORS_ONLN") - if isinstance(ncpus, int) and ncpus > 0: - cpus = ncpus - elif sys.platform in ('darwin'): # OSX: - cpus = int(os.popen2("sysctl -n hw.ncpu")[1].read()) - - # TODO(ojan): Use cpus+1 once we flesh out the flakiness. - options.num_test_shells = cpus - - else: - options.num_test_shells = 1 + cpus = 1 + if sys.platform in ('win32', 'cygwin'): + cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) + elif (hasattr(os, "sysconf") and + os.sysconf_names.has_key("SC_NPROCESSORS_ONLN")): + # Linux & Unix: + ncpus = os.sysconf("SC_NPROCESSORS_ONLN") + if isinstance(ncpus, int) and ncpus > 0: + cpus = ncpus + elif sys.platform in ('darwin'): # OSX: + cpus = int(os.popen2("sysctl -n hw.ncpu")[1].read()) + + # TODO(ojan): Use cpus+1 once we flesh out the flakiness. + options.num_test_shells = cpus logging.info("Running %s test_shells in parallel" % options.num_test_shells) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 9e251d8..5b47746 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -673,7 +673,7 @@ DEFER LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-11-b.svg = FAIL DEFER LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-13-b.svg = FAIL // Merge 39744:39829 - regression -DEFER : LayoutTests/svg/custom/path-bad-data.svg = FAIL +DEFER RELEASE : LayoutTests/svg/custom/path-bad-data.svg = FAIL // Upstream dumprendertree changes caused the expected to change. // Now our baseline is out of date, and we differ from Mac expected on the @@ -1450,7 +1450,6 @@ MAC : LayoutTests/http/tests/navigation/javascriptlink-goback.html = FAIL LINUX MAC : LayoutTests/http/tests/navigation/javascriptlink-subframeload.html = FAIL TIMEOUT PASS MAC : LayoutTests/http/tests/navigation/metaredirect-frames.html = FAIL MAC : LayoutTests/http/tests/navigation/metaredirect-goback.html = FAIL -MAC : LayoutTests/http/tests/navigation/metaredirect-subframeload.html = FAIL MAC : LayoutTests/http/tests/navigation/redirect302-frames.html = FAIL MAC : LayoutTests/http/tests/navigation/relativeanchor-goback.html = FAIL MAC : LayoutTests/http/tests/navigation/reload-subframe-object.html = FAIL TIMEOUT @@ -2317,6 +2316,10 @@ LINUX : LayoutTests/editing/selection/move-by-line-001.html = FAIL BUG9798 : LayoutTests/http/tests/xmlhttprequest/basic-auth.html = TIMEOUT PASS BUG9798 : LayoutTests/editing/execCommand/15381.html = FAIL PASS +BUG9798 DEBUG : LayoutTests/svg/custom/path-bad-data.svg = CRASH FAIL +BUG9798 DEBUG : chrome/fast/dom/extensions/interval.html = FAIL PASS +BUG9798 MAC : LayoutTests/http/tests/navigation/metaredirect-subframeload.html = TIMEOUT FAIL +BUG9798 LINUX WIN : LayoutTests/http/tests/navigation/metaredirect-subframeload.html = TIMEOUT PASS BUG9798 LINUX : LayoutTests/animations/animation-iteration-event-destroy-renderer.html = TIMEOUT PASS BUG9798 LINUX : LayoutTests/animations/change-keyframes-name.html = FAIL PASS |