Attachment 341187 Details for Bug 185643 – Try to fix GTK+ build

[patch] Try to fix GTK+ build

wk-branch-build.diff (text/plain), 2.40 KB, created by Carlos Garcia Campos on 2018-05-24 07:24:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2018-05-24 07:24:01 PDT

Size: 2.40 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index fbee6d508f5..eed99bbdb12 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        run-gtk-tests (glib/common.py) cannot determine build directory when webKitBranchBuild=true
>+        https://bugs.webkit.org/show_bug.cgi?id=185643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Check if webKitBranchBuild is true in git config to add the branch name to the build path.
>+
>+        * glib/common.py:
>+        (get_build_path):
>+
> 2018-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         WebDriver: implement maximize, minimize and fullscreen window commands
>diff --git a/Tools/glib/common.py b/Tools/glib/common.py
>index 8a7b2fb465b..435e39ed1b3 100644
>--- a/Tools/glib/common.py
>+++ b/Tools/glib/common.py
>@@ -21,6 +21,15 @@ import select
> 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
>@@ -75,9 +84,17 @@ def get_build_path(fatal=True):
>     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_git_config('core.webKitBranchBuild', cwd=scm.checkout_root, executive=scm._executive)
>+        if is_branch_build and is_branch_build.lower() == 'true':
>+            base_build_dir = os.path.join(base_build_dir, scm._current_branch())
>+
>     global build_types
>     for build_type in build_types:
>-        build_dir = top_level_path('WebKitBuild', build_type)
>+        build_dir = os.path.join(base_build_dir, build_type)
>         if is_valid_build_directory(build_dir):
>             return build_dir
> 
>@@ -90,7 +107,7 @@ def get_build_path(fatal=True):
>     if is_valid_build_directory(build_dir):
>         return build_dir
> 
>-    build_dir = top_level_path("WebKitBuild")
>+    build_dir = base_build_dir
>     if is_valid_build_directory(build_dir):
>         return build_dir
>

Flags:

fred.wang: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185643: 341184 | 341187 | 343154 | 343203