Diff
Modified: trunk/Tools/ChangeLog (234095 => 234096)
--- trunk/Tools/ChangeLog 2018-07-23 07:09:54 UTC (rev 234095)
+++ trunk/Tools/ChangeLog 2018-07-23 14:12:37 UTC (rev 234096)
@@ -1,3 +1,17 @@
+2018-07-23 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r233030.
+ https://bugs.webkit.org/show_bug.cgi?id=187904
+
+ Broke tarball builds (Requested by mcatanzaro on #webkit).
+
+ Reverted changeset:
+
+ "run-gtk-tests (glib/common.py) cannot determine build
+ directory when webKitBranchBuild=true"
+ https://bugs.webkit.org/show_bug.cgi?id=185643
+ https://trac.webkit.org/changeset/233030
+
2018-07-21 Simon Fraser <[email protected]>
Fix lldb summarizers for HashMaps and HashSets
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (234095 => 234096)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2018-07-23 07:09:54 UTC (rev 234095)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2018-07-23 14:12:37 UTC (rev 234096)
@@ -136,23 +136,14 @@
return filepath.replace(root_end_with_slash, '')
@classmethod
- def read_git_config(cls, key, output_type=None, cwd=None, executive=None):
+ def read_git_config(cls, key, cwd=None, executive=None):
# FIXME: This should probably use cwd=self.checkout_root.
# Pass --get-all for cases where the config has multiple values
# Pass the cwd if provided so that we can handle the case of running webkit-patch outside of the working directory.
# FIXME: This should use an Executive.
executive = executive or Executive()
- cmd = [cls.executable_name, "config", "--get-all"]
- if output_type == bool:
- cmd.append("--bool")
- elif output_type == int:
- cmd.append("--int")
- cmd.append(key)
- return executive.run_command(cmd, ignore_errors=True, cwd=cwd).rstrip('\n')
+ return executive.run_command([cls.executable_name, "config", "--get-all", key], ignore_errors=True, cwd=cwd).rstrip('\n')
- def read_config(self, key, output_type=None):
- return self.read_git_config(key, output_type, self.checkout_root, self._executive)
-
@staticmethod
def commit_success_regexp():
return "^Committed r(?P<svn_revision>\d+)$"
@@ -202,7 +193,7 @@
def _upstream_branch(self):
current_branch = self._current_branch()
- return self._branch_from_ref(self.read_config('branch.%s.merge' % current_branch).strip())
+ return self._branch_from_ref(self.read_git_config('branch.%s.merge' % current_branch, cwd=self.checkout_root, executive=self._executive).strip())
def merge_base(self, git_commit):
if git_commit:
@@ -418,7 +409,7 @@
self._run_git(['checkout', 'HEAD'] + file_paths)
def _assert_can_squash(self, has_working_directory_changes):
- squash = self.read_config('webkit-patch.commit-should-always-squash')
+ squash = self.read_git_config('webkit-patch.commit-should-always-squash', cwd=self.checkout_root, executive=self._executive)
should_squash = squash and squash.lower() == "true"
if not should_squash:
@@ -530,7 +521,7 @@
def remote_branch_ref(self):
# Use references so that we can avoid collisions, e.g. we don't want to operate on refs/heads/trunk if it exists.
- remote_branch_refs = self.read_config('svn-remote.svn.fetch')
+ remote_branch_refs = self.read_git_config('svn-remote.svn.fetch', cwd=self.checkout_root, executive=self._executive)
if not remote_branch_refs:
remote_master_ref = 'refs/remotes/origin/master'
if not self.branch_ref_exists(remote_master_ref):
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (234095 => 234096)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2018-07-23 07:09:54 UTC (rev 234095)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2018-07-23 14:12:37 UTC (rev 234096)
@@ -1164,49 +1164,6 @@
run_command(['git', 'config', key, value])
self.assertEqual(self.scm.read_git_config(key), value)
- value = 'true'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
-
- value = 'yes'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, bool), 'true')
-
- value = 'oN'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, bool), 'true')
-
- value = '1'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, bool), 'true')
-
- value = 'false'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
-
- value = 'no'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, bool), 'false')
-
- value = 'oFf'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, bool), 'false')
-
- value = '0'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, bool), 'false')
-
- value = '1k'
- run_command(['git', 'config', key, value])
- self.assertEqual(self.scm.read_git_config(key), value)
- self.assertEqual(self.scm.read_git_config(key, int), '1024')
-
def test_local_commits(self):
test_file = os.path.join(self.git_checkout_path, 'test_file')
write_into_file_at_path(test_file, 'foo')
Modified: trunk/Tools/glib/common.py (234095 => 234096)
--- trunk/Tools/glib/common.py 2018-07-23 07:09:54 UTC (rev 234095)
+++ trunk/Tools/glib/common.py 2018-07-23 14:12:37 UTC (rev 234096)
@@ -21,15 +21,6 @@
import subprocess
import sys
-tools_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'Tools', 'Scripts'))
-if tools_dir not in sys.path:
- sys.path.insert(0, tools_dir)
-
-from webkitpy.common.checkout.scm import Git
-from webkitpy.common.checkout.scm.detection import SCMDetector
-from webkitpy.common.system.executive import Executive
-from webkitpy.common.system.filesystem import FileSystem
-
top_level_dir = None
build_dir = None
library_build_dir = None
@@ -84,19 +75,9 @@
if is_valid_build_directory(build_dir):
return build_dir
- base_build_dir = top_level_path('WebKitBuild')
-
- scm = SCMDetector(FileSystem(), Executive()).default_scm()
- if isinstance(scm, Git):
- is_branch_build = scm.read_config('core.webKitBranchBuild', bool)
- if is_branch_build and is_branch_build.lower() == 'true':
- current_branch = scm._current_branch()
- if current_branch != 'master':
- base_build_dir = os.path.join(base_build_dir, scm._current_branch())
-
global build_types
for build_type in build_types:
- build_dir = os.path.join(base_build_dir, build_type)
+ build_dir = top_level_path('WebKitBuild', build_type)
if is_valid_build_directory(build_dir):
return build_dir
@@ -109,7 +90,7 @@
if is_valid_build_directory(build_dir):
return build_dir
- build_dir = base_build_dir
+ build_dir = top_level_path("WebKitBuild")
if is_valid_build_directory(build_dir):
return build_dir
