| Index: Tools/Scripts/webkitpy/layout_tests/bisect_test_ordering.py
|
| diff --git a/Tools/Scripts/webkitpy/layout_tests/bisect_test_ordering.py b/Tools/Scripts/webkitpy/layout_tests/bisect_test_ordering.py
|
| index a10ed15fa9a4287787d74e0c390284b08829d435..6a79fc4e93b018596f009f02022ba328ef684ef5 100644
|
| --- a/Tools/Scripts/webkitpy/layout_tests/bisect_test_ordering.py
|
| +++ b/Tools/Scripts/webkitpy/layout_tests/bisect_test_ordering.py
|
| @@ -41,6 +41,7 @@ _log = logging.getLogger(__name__)
|
|
|
|
|
| class Bucket(object):
|
| +
|
| def __init__(self, tests):
|
| self.tests = tests
|
|
|
| @@ -99,7 +100,7 @@ class Bisector(object):
|
| for bucket in self.buckets:
|
| tests += bucket.tests
|
| extra_args = ' --debug' if self.is_debug else ''
|
| - print 'run-webkit-tests%s --child-processes=1 --order=none %s' % (extra_args, " ".join(tests))
|
| + print 'run-webkit-tests%s --child-processes=1 --order=none %s' % (extra_args, ' '.join(tests))
|
|
|
| def is_done(self):
|
| for bucket in self.buckets:
|
| @@ -147,7 +148,16 @@ class Bisector(object):
|
| def test_fails(self, tests):
|
| extra_args = ['--debug'] if self.is_debug else []
|
| path_to_run_webkit_tests = self.webkit_finder.path_from_webkit_base('Tools', 'Scripts', 'run-webkit-tests')
|
| - output = self.executive.popen([path_to_run_webkit_tests, '--child-processes', '1', '--order', 'none', '--no-retry', '--no-show-results', '--verbose'] + extra_args + tests, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
| + output = self.executive.popen([path_to_run_webkit_tests,
|
| + '--child-processes',
|
| + '1',
|
| + '--order',
|
| + 'none',
|
| + '--no-retry',
|
| + '--no-show-results',
|
| + '--verbose'] + extra_args + tests,
|
| + stdout=subprocess.PIPE,
|
| + stderr=subprocess.PIPE)
|
| failure_string = self.expected_failure + ' failed'
|
| if failure_string in output.stderr.read():
|
| return True
|
| @@ -158,7 +168,11 @@ def main(argv):
|
| logging.basicConfig()
|
|
|
| option_parser = optparse.OptionParser()
|
| - option_parser.add_option('--test-list', action='store', help='file that list tests to bisect. The last test in the list is the expected failure.', metavar='FILE'),
|
| + option_parser.add_option(
|
| + '--test-list',
|
| + action='store',
|
| + help='file that list tests to bisect. The last test in the list is the expected failure.',
|
| + metavar='FILE'),
|
| option_parser.add_option('--debug', action='store_true', default=False, help='whether to use a debug build'),
|
| options, args = option_parser.parse_args(argv)
|
|
|
|
|