Changeset 246637 in webkit

Timestamp:

Jun 20, 2019, 10:04:19 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] HTTP layout tests don't run in flatpak
​https://bugs.webkit.org/show_bug.cgi?id=199067

Patch by Alexander Mikhaylenko <​exalm7659@gmail.com> on 2019-06-20
Reviewed by Michael Catanzaro.

Tools:

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):

LayoutTests:

Set PERL5LIB environment variable in Apache config.

• http/conf/flatpak-httpd.conf:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/conf/flatpak-httpd.conf (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/base.py (modified) (2 diffs)
• Tools/flatpak/flatpakutils.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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 Michael Catanzaro.
+
+        Set PERL5LIB environment variable in Apache config.
+
+        * http/conf/flatpak-httpd.conf:
+
 2019-06-18  Darin Adler  <darin@apple.com>
 

trunk/LayoutTests/http/conf/flatpak-httpd.conf

@@ -34 +34 @@
 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

trunk/Tools/ChangeLog

@@ +1 @@
+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 Michael Catanzaro.
+
+        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-18  Darin Adler  <darin@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1272 +1272 @@
 
     def _is_flatpak(self):
-        return self._filesystem.exists('/usr/manifest.json')
+        return self._filesystem.exists('/.flatpak-info')
 
     def _apache_version(self):
@@ -1466 +1466 @@
 
     def _in_flatpak_sandbox(self):
-        return os.path.exists("/usr/manifest.json")
+        return os.path.exists("/.flatpak-info")
 
     def _should_use_jhbuild(self):

trunk/Tools/flatpak/flatpakutils.py

@@ -738 +738 @@
                 # 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),
@@ -958 +957 @@
 
 def is_sandboxed():
-    return os.path.exists("/usr/manifest.json")
+    return os.path.exists("/.flatpak-info")