Attachment 372553 Details for Bug 199067 – Patch

[patch] Patch

bug-199067-20190620192726.patch (text/plain), 4.38 KB, created by Alice Mikhaylenko on 2019-06-20 07:27:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alice Mikhaylenko

Created: 2019-06-20 07:27:28 PDT

Size: 4.38 KB

patch

obsolete

>Subversion Revision: 246598
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f9cbd5d98cffc81fa880138bb6716cf0df4ef12d..3655ee9b9cee6746c8a5ae02686cdd290f58f9ce 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-06-20  Alexander Mikhaylenko  <exalm7659@gmail.com>
>+
>+        [GTK] HTTP layout tests don't run in flatpak
>+        https://bugs.webkit.org/show_bug.cgi?id=199067
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Stop bind mounting /app/lib/perl to /etc/perl because Perl doesn't actually
>+        check that path. Instead, add /app/lib/perl to Apache config directly.
>+
>+        /usr/manifest.json file is not guaranteed to exist in sandbox, check for
>+        /.flatpak-info instead.
>+
>+        * Scripts/webkitpy/port/base.py:
>+        (Port._is_flatpak):
>+        (Port._in_flatpak_sandbox):
>+        * flatpak/flatpakutils.py:
>+        (WebkitFlatpak.run_in_sandbox):
>+        (is_sandboxed):
>+
> 2019-06-19  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed, fix build warnings in TestWebKitAPIInjectedBundle
>diff --git a/Tools/Scripts/webkitpy/port/base.py b/Tools/Scripts/webkitpy/port/base.py
>index b0f88b6d8d131053e18c6cd34ef11406609bfa2c..3505f1e8e3623aba44b4e86a1d94be8528412773 100644
>--- a/Tools/Scripts/webkitpy/port/base.py
>+++ b/Tools/Scripts/webkitpy/port/base.py
>@@ -1271,7 +1271,7 @@ class Port(object):
>         return self._filesystem.exists('/etc/arch-release')
> 
>     def _is_flatpak(self):
>-        return self._filesystem.exists('/usr/manifest.json')
>+        return self._filesystem.exists('/.flatpak-info')
> 
>     def _apache_version(self):
>         config = self._executive.run_command([self._path_to_apache(), '-v'])
>@@ -1465,7 +1465,7 @@ class Port(object):
>         return self._filesystem.exists(self.path_from_webkit_base('WebKitBuild', suffix, "FlatpakTree"))
> 
>     def _in_flatpak_sandbox(self):
>-        return os.path.exists("/usr/manifest.json")
>+        return os.path.exists("/.flatpak-info")
> 
>     def _should_use_jhbuild(self):
>         if self._in_flatpak_sandbox():
>diff --git a/Tools/flatpak/flatpakutils.py b/Tools/flatpak/flatpakutils.py
>index d52131803544b9de3c9e804f3fd88a3ae1f21a6f..89ebc67310c1d5b84c90cf5407f940c01b05eee6 100644
>--- a/Tools/flatpak/flatpakutils.py
>+++ b/Tools/flatpak/flatpakutils.py
>@@ -737,7 +737,6 @@ class WebkitFlatpak:
>                 "--bind-mount=/run/shm=/dev/shm",
>                 # Workaround for https://webkit.org/b/187384 to have our own perl modules usable inside the sandbox
>                 # as setting the PERL5LIB envvar won't work inside apache (and for scripts using `perl -T``).
>-                "--bind-mount=/etc/perl=%s" % os.path.join(self.flatpak_build_path, "files/lib/perl"),
>                 "--bind-mount=/run/host/%s=%s" % (tempfile.gettempdir(), tempfile.gettempdir()),
>                 "--bind-mount=%s=%s" % (self.sandbox_source_root, self.source_root),
>                 "--talk-name=org.a11y.Bus",
>@@ -957,7 +956,7 @@ class WebkitFlatpak:
> 
> 
> def is_sandboxed():
>-    return os.path.exists("/usr/manifest.json")
>+    return os.path.exists("/.flatpak-info")
> 
> 
> def run_in_sandbox_if_available(args):
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index beaefbc3a25394d0746b3860040251417e65d904..a1b22d35573d355b5f916b808337edbba37006a0 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-20  Alexander Mikhaylenko  <exalm7659@gmail.com>
>+
>+        [GTK] HTTP layout tests don't run in flatpak
>+        https://bugs.webkit.org/show_bug.cgi?id=199067
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Set PERL5LIB environment variable in Apache config.
>+
>+        * http/conf/flatpak-httpd.conf:
>+
> 2019-06-19  Russell Epstein  <russell_e@apple.com>
> 
>         webgpu/blend-color-triangle-strip.html is a flakey failure since introduction.
>diff --git a/LayoutTests/http/conf/flatpak-httpd.conf b/LayoutTests/http/conf/flatpak-httpd.conf
>index c04c4ef31955991238a46bff81bc5a9678814906..3c03e4239c24989d9cd79686144bc7ce2b30c31b 100644
>--- a/LayoutTests/http/conf/flatpak-httpd.conf
>+++ b/LayoutTests/http/conf/flatpak-httpd.conf
>@@ -33,6 +33,9 @@ LoadModule log_config_module    modules/mod_log_config.so
> LoadModule ssl_module           modules/mod_ssl.so
> LoadModule php7_module          modules/libphp7.so
> LoadModule asis_module          modules/mod_asis.so
>+LoadModule env_module           modules/mod_env.so
>+
>+SetEnv PERL5LIB /app/lib/perl
> 
> ServerName 127.0.0.1
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199067: 372553