Diff
Modified: trunk/Tools/ChangeLog (256893 => 256894)
--- trunk/Tools/ChangeLog 2020-02-19 01:14:28 UTC (rev 256893)
+++ trunk/Tools/ChangeLog 2020-02-19 01:16:08 UTC (rev 256894)
@@ -1,3 +1,16 @@
+2020-02-18 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r256851.
+
+ Broke internal bots
+
+ Reverted changeset:
+
+ "Stub repositories fail to upload some results due to missing
+ head svn revision"
+ https://bugs.webkit.org/show_bug.cgi?id=207684
+ https://trac.webkit.org/changeset/256851
+
2020-02-18 Fujii Hironori <[email protected]>
[Win][MiniBrowser] Support back/forward mouse buttons by handing APPCOMMAND_BROWSER_BACKWARD and APPCOMMAND_BROWSER_FORWARD
Modified: trunk/Tools/Scripts/webkitpy/api_tests/run_api_tests.py (256893 => 256894)
--- trunk/Tools/Scripts/webkitpy/api_tests/run_api_tests.py 2020-02-19 01:14:28 UTC (rev 256893)
+++ trunk/Tools/Scripts/webkitpy/api_tests/run_api_tests.py 2020-02-19 01:16:08 UTC (rev 256894)
@@ -41,7 +41,6 @@
def main(argv, stdout, stderr):
options, args = parse_args(argv)
host = Host()
- host.initialize_scm()
try:
options.webkit_test_runner = True
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py (256893 => 256894)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2020-02-19 01:14:28 UTC (rev 256893)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2020-02-19 01:16:08 UTC (rev 256894)
@@ -359,7 +359,7 @@
# FIXME: Do we really need to populate this both here and in the json_results_generator?
if port_obj.get_option("builder_name"):
port_obj.host.initialize_scm()
- results['revision'] = port_obj.commits_for_upload()[0]['id']
+ results['revision'] = port_obj.host.scm().head_svn_revision()
except Exception as e:
_log.warn("Failed to determine svn revision for checkout (cwd: %s, webkit_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj._filesystem.getcwd(), port_obj.path_from_webkit_base(), e))
# Handle cases where we're running outside of version control.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (256893 => 256894)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2020-02-19 01:14:28 UTC (rev 256893)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2020-02-19 01:16:08 UTC (rev 256894)
@@ -64,7 +64,6 @@
host = MockHost()
else:
host = Host()
- host.initialize_scm()
if options.lint_test_files:
from webkitpy.layout_tests.lint_test_expectations import lint
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (256893 => 256894)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2020-02-19 01:14:28 UTC (rev 256893)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2020-02-19 01:16:08 UTC (rev 256894)
@@ -1601,12 +1601,16 @@
repos = {}
if port_config.apple_additions() and getattr(port_config.apple_additions(), 'repos', False):
repos = port_config.apple_additions().repos()
- repos['webkit'] = self.host.scm().checkout_root
+
+ up = os.path.dirname
+ repos['webkit'] = up(up(up(up(up(os.path.abspath(__file__))))))
+
commits = []
for repo_id, path in repos.items():
+ scm = SCMDetector(self._filesystem, self._executive).detect_scm_system(path)
commits.append(Upload.create_commit(
repository_id=repo_id,
- id=self.host.scm().native_revision(path),
- branch=self.host.scm().native_branch(path),
+ id=scm.native_revision(path),
+ branch=scm.native_branch(path),
))
return commits
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (256893 => 256894)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2020-02-19 01:14:28 UTC (rev 256893)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2020-02-19 01:16:08 UTC (rev 256894)
@@ -50,7 +50,6 @@
_log = logging.getLogger(__name__)
_host = Host()
-_host.initialize_scm()
_webkit_root = None
@@ -58,7 +57,8 @@
global _webkit_root
configure_logging(logger=_log)
- _webkit_root = _host.scm().checkout_root
+ up = os.path.dirname
+ _webkit_root = up(up(up(up(up(os.path.abspath(__file__))))))
tester = Tester()
tester.add_tree(os.path.join(_webkit_root, 'Tools', 'Scripts'), 'webkitpy')
@@ -226,6 +226,7 @@
for test, failures in test_runner.failures:
results[test] = Upload.create_test_result(actual=Upload.Expectations.FAIL, log='/n'.join(failures))
+ _host.initialize_scm()
upload = Upload(
suite='webkitpy-tests',
configuration=Upload.create_configuration(
