Title: [234137] trunk/Tools
- Revision
- 234137
- Author
- [email protected]
- Date
- 2018-07-24 01:15:57 -0700 (Tue, 24 Jul 2018)
Log Message
[Flatpak] Remove now unnecessary 'hacks' for running tests
https://bugs.webkit.org/show_bug.cgi?id=187608
Patch by Thibault Saunier <[email protected]> on 2018-07-24
Reviewed by Philippe Normand.
We used to need to not share X11 with the sandbox when running tests
but it is not needed anymore as we do not mount `/tmp` on `/tmp` in the
sandbox (we mount it on `/run/host/tmp` now).
This has the advantage of making running the MiniBrowser to display test
results working again.
* flatpak/flatpakutils.py:
(WebkitFlatpak.clean_args):
(WebkitFlatpak.run_in_sandbox):
(WebkitFlatpak._cleanup_faltpak_args_for_tests_if_needed): Deleted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (234136 => 234137)
--- trunk/Tools/ChangeLog 2018-07-24 08:14:40 UTC (rev 234136)
+++ trunk/Tools/ChangeLog 2018-07-24 08:15:57 UTC (rev 234137)
@@ -1,3 +1,22 @@
+2018-07-24 Thibault Saunier <[email protected]>
+
+ [Flatpak] Remove now unnecessary 'hacks' for running tests
+ https://bugs.webkit.org/show_bug.cgi?id=187608
+
+ Reviewed by Philippe Normand.
+
+ We used to need to not share X11 with the sandbox when running tests
+ but it is not needed anymore as we do not mount `/tmp` on `/tmp` in the
+ sandbox (we mount it on `/run/host/tmp` now).
+
+ This has the advantage of making running the MiniBrowser to display test
+ results working again.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.clean_args):
+ (WebkitFlatpak.run_in_sandbox):
+ (WebkitFlatpak._cleanup_faltpak_args_for_tests_if_needed): Deleted.
+
2018-07-23 Fujii Hironori <[email protected]>
webkitpy.port.server_process_unittest.TestServerProcess.test_basic failed on Windows Python
Modified: trunk/Tools/flatpak/flatpakutils.py (234136 => 234137)
--- trunk/Tools/flatpak/flatpakutils.py 2018-07-24 08:14:40 UTC (rev 234136)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-07-24 08:15:57 UTC (rev 234137)
@@ -649,16 +649,6 @@
return True
- def _cleanup_faltpak_args_for_tests_if_needed(self, args):
- if not args or not args[0].endswith('run-webkit-tests'):
- return self.finish_args
-
- # We are going to run our own Xvfb server in the sandbox
- unwanted_args = ["--socket=x11"]
- finish_args = [e for e in self.finish_args if e not in unwanted_args]
-
- return finish_args
-
def run_in_sandbox(self, *args, **kwargs):
cwd = kwargs.pop("cwd", None)
stdout = kwargs.pop("stdout", sys.stdout)
@@ -700,8 +690,7 @@
for envvar, value in forwarded.items():
flatpak_command.append("--env=%s=%s" % (envvar, value))
- finish_args = self._cleanup_faltpak_args_for_tests_if_needed(args)
- flatpak_command += finish_args + extra_flatpak_args + [self.flatpak_build_path]
+ flatpak_command += self.finish_args + extra_flatpak_args + [self.flatpak_build_path]
shell_string = ""
if args:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
