Attachment 358605 Details for Bug 193242 – Patch

[patch] Patch

bug-193242-20190108174614.patch (text/plain), 3.02 KB, created by Philippe Normand on 2019-01-08 09:46:15 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2019-01-08 09:46:15 PST

Size: 3.02 KB

patch

obsolete

>Subversion Revision: 239725
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ed3a4b4b920996e7e9d704e3862e175c571db4fa..43c3646e6f2d0a97edbedd7f27ca1f70b510e895 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-08  Philippe Normand  <pnormand@igalia.com>
>+
>+        [WPE] API tests can't run in flatpak environment
>+        https://bugs.webkit.org/show_bug.cgi?id=193242
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/run-wpe-tests: Add --wpe to arguments passed to
>+        flatpakutils so that it knows which port it's dealing with.
>+        * glib/common.py: Remove build_dir globals so that subsequent
>+        calls actually take args into account.
>+        (library_build_path):
>+        (binary_build_path):
>+
> 2019-01-07  David Kilzer  <ddkilzer@apple.com>
> 
>         Leak of ScrollCompletionCallbackData (16 bytes) in com.apple.WebKit.WebContent running WebKit layout tests
>diff --git a/Tools/Scripts/run-wpe-tests b/Tools/Scripts/run-wpe-tests
>index 5c682f860292a7423a9973ff372b8430f2cac95e..e77ebe994e7f35f8282cad620cfeeb539d58f8c7 100755
>--- a/Tools/Scripts/run-wpe-tests
>+++ b/Tools/Scripts/run-wpe-tests
>@@ -44,7 +44,7 @@ class WPETestRunner(TestRunner):
> 
> 
> if __name__ == "__main__":
>-    flatpakutils.run_in_sandbox_if_available(sys.argv)
>+    flatpakutils.run_in_sandbox_if_available([sys.argv[0], "--wpe"] + sys.argv[1:])
>     if not flatpakutils.is_sandboxed() and not jhbuildutils.enter_jhbuild_environment_if_available("wpe"):
>         print '***'
>         print '*** Warning: jhbuild environment not present and not running in flatpak.'
>@@ -55,7 +55,11 @@ if __name__ == "__main__":
>     add_options(option_parser);
>     option_parser.add_option('--display-server', choices=['headless', 'wayland'], default='headless',
>                              help='"headless": Use headless view backend. "wayland": Use the current wayland session.'),
>-    options, args = option_parser.parse_args()
>+
>+    args = sys.argv[1:]
>+    if flatpakutils.is_sandboxed():
>+        args = [ arg for arg in args if arg != "--wpe" ]
>+    options, args = option_parser.parse_args(args)
> 
>     logging.basicConfig(level=logging.INFO, format="%(message)s")
> 
>diff --git a/Tools/glib/common.py b/Tools/glib/common.py
>index 8a7b2fb465b172798b521d2bc59b84fc5680148e..9dc65618690e6cb832823d976cab27d806e480c2 100644
>--- a/Tools/glib/common.py
>+++ b/Tools/glib/common.py
>@@ -23,8 +23,6 @@ import sys
> 
> top_level_dir = None
> build_dir = None
>-library_build_dir = None
>-binary_build_dir = None
> build_types = ('Release', 'Debug')
> 
> 
>@@ -41,17 +39,11 @@ def set_build_types(new_build_types):
> 
> 
> def library_build_path(*args):
>-    global library_build_dir
>-    if not library_build_dir:
>-        library_build_dir = build_path('lib', *args)
>-    return library_build_dir
>+    return build_path('lib', *args)
> 
> 
> def binary_build_path(*args):
>-    global binary_build_dir
>-    if not binary_build_dir:
>-        binary_build_dir = build_path('bin', *args)
>-    return binary_build_dir
>+    return build_path('bin', *args)
> 
> 
> def get_build_path(fatal=True):

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193242: 358605