- Revision
- 157804
- Author
- commit-qu...@webkit.org
- Date
- 2013-10-22 12:28:53 -0700 (Tue, 22 Oct 2013)
Log Message
Unreviewed, rolling out r157774.
http://trac.webkit.org/changeset/157774
https://bugs.webkit.org/show_bug.cgi?id=123167
causes python test to fail (Requested by smfr on #webkit).
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager.run):
* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectations.__init__):
(TestExpectations._add_expectations):
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(parse_args):
(_set_up_derived_options):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (157803 => 157804)
--- trunk/Tools/ChangeLog 2013-10-22 19:25:09 UTC (rev 157803)
+++ trunk/Tools/ChangeLog 2013-10-22 19:28:53 UTC (rev 157804)
@@ -1,3 +1,20 @@
+2013-10-22 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r157774.
+ http://trac.webkit.org/changeset/157774
+ https://bugs.webkit.org/show_bug.cgi?id=123167
+
+ causes python test to fail (Requested by smfr on #webkit).
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager.run):
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ (TestExpectations.__init__):
+ (TestExpectations._add_expectations):
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args):
+ (_set_up_derived_options):
+
2013-10-22 Lucas Forschler <lforsch...@apple.com>
Prepare WebKit Buildbot master for Mavericks.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (157803 => 157804)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2013-10-22 19:25:09 UTC (rev 157803)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2013-10-22 19:28:53 UTC (rev 157804)
@@ -179,7 +179,7 @@
return test_run_results.RunDetails(exit_code=-1)
self._printer.write_update("Parsing expectations ...")
- self._expectations = test_expectations.TestExpectations(self._port, test_names, force_expectations_pass=self._options.force)
+ self._expectations = test_expectations.TestExpectations(self._port, test_names)
tests_to_run, tests_to_skip = self._prepare_lists(paths, test_names)
self._printer.print_found(len(test_names), len(tests_to_run), self._options.repeat_each, self._options.iterations)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (157803 => 157804)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2013-10-22 19:25:09 UTC (rev 157803)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2013-10-22 19:28:53 UTC (rev 157804)
@@ -833,7 +833,7 @@
# FIXME: This constructor does too much work. We should move the actual parsing of
# the expectations into separate routines so that linting and handling overrides
# can be controlled separately, and the constructor can be more of a no-op.
- def __init__(self, port, tests=None, include_generic=True, include_overrides=True, expectations_to_lint=None, force_expectations_pass=False):
+ def __init__(self, port, tests=None, include_generic=True, include_overrides=True, expectations_to_lint=None):
self._full_test_list = tests
self._test_config = port.test_configuration()
self._is_lint_mode = expectations_to_lint is not None
@@ -842,7 +842,6 @@
self._port = port
self._skipped_tests_warnings = []
self._expectations = []
- self._force_expectations_pass = force_expectations_pass
expectations_dict = expectations_to_lint or port.expectations_dict()
@@ -991,11 +990,7 @@
def _add_expectations(self, expectation_list):
for expectation_line in expectation_list:
- if self._force_expectations_pass:
- expectation_line.expectations = ['PASS']
- expectation_line.parsed_expectations = set([PASS])
-
- elif not expectation_line.expectations:
+ if not expectation_line.expectations:
continue
if self._is_lint_mode or self._test_config in expectation_line.matching_configurations:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (157803 => 157804)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2013-10-22 19:25:09 UTC (rev 157803)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2013-10-22 19:28:53 UTC (rev 157804)
@@ -226,8 +226,8 @@
"'ignore' == Run them anyway, "
"'only' == only run the SKIP tests, "
"'always' == always skip, even if listed on the command line.")),
- optparse.make_option("--force", action="" default=False,
- help="Run all tests with PASS as expected result, even those marked SKIP in the test list (implies --skipped=ignore)"),
+ optparse.make_option("--force", dest="skipped", action="" const='ignore',
+ help="Run all tests, even those marked SKIP in the test list (same as --skipped=ignore)"),
optparse.make_option("--time-out-ms",
help="Set the timeout for each test"),
optparse.make_option("--order", action="" default="natural",
@@ -333,10 +333,6 @@
additional_platform_directories.append(port.host.filesystem.abspath(path))
options.additional_platform_directory = additional_platform_directories
- if options.force and options.skipped not in ('ignore', 'default'):
- _log.warning("--force overrides --skipped=%s" % (options.skipped))
- options.skipped = 'ignore'
-
if not options.http and options.skipped in ('ignore', 'only'):
_log.warning("--force/--skipped=%s overrides --no-http." % (options.skipped))
options.http = True
