Title: [246637] trunk
- Revision
- 246637
- Author
- commit-qu...@webkit.org
- Date
- 2019-06-20 10:04:19 -0700 (Thu, 20 Jun 2019)
Log Message
[GTK] HTTP layout tests don't run in flatpak
https://bugs.webkit.org/show_bug.cgi?id=199067
Patch by Alexander Mikhaylenko <exalm7...@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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (246636 => 246637)
--- trunk/LayoutTests/ChangeLog 2019-06-20 16:21:50 UTC (rev 246636)
+++ trunk/LayoutTests/ChangeLog 2019-06-20 17:04:19 UTC (rev 246637)
@@ -1,3 +1,14 @@
+2019-06-20 Alexander Mikhaylenko <exalm7...@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 <da...@apple.com>
Tidy up the remaining bits of the AtomicString to AtomString rename
Modified: trunk/LayoutTests/http/conf/flatpak-httpd.conf (246636 => 246637)
--- trunk/LayoutTests/http/conf/flatpak-httpd.conf 2019-06-20 16:21:50 UTC (rev 246636)
+++ trunk/LayoutTests/http/conf/flatpak-httpd.conf 2019-06-20 17:04:19 UTC (rev 246637)
@@ -33,7 +33,10 @@
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
<Directory />
Modified: trunk/Tools/ChangeLog (246636 => 246637)
--- trunk/Tools/ChangeLog 2019-06-20 16:21:50 UTC (rev 246636)
+++ trunk/Tools/ChangeLog 2019-06-20 17:04:19 UTC (rev 246637)
@@ -1,3 +1,23 @@
+2019-06-20 Alexander Mikhaylenko <exalm7...@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 <da...@apple.com>
Tidy up the remaining bits of the AtomicString to AtomString rename
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (246636 => 246637)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-06-20 16:21:50 UTC (rev 246636)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-06-20 17:04:19 UTC (rev 246637)
@@ -1271,7 +1271,7 @@
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 @@
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():
Modified: trunk/Tools/flatpak/flatpakutils.py (246636 => 246637)
--- trunk/Tools/flatpak/flatpakutils.py 2019-06-20 16:21:50 UTC (rev 246636)
+++ trunk/Tools/flatpak/flatpakutils.py 2019-06-20 17:04:19 UTC (rev 246637)
@@ -737,7 +737,6 @@
"--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 @@
def is_sandboxed():
- return os.path.exists("/usr/manifest.json")
+ return os.path.exists("/.flatpak-info")
def run_in_sandbox_if_available(args):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
