Title: [259456] trunk/Tools
Revision
259456
Author
[email protected]
Date
2020-04-03 07:11:17 -0700 (Fri, 03 Apr 2020)

Log Message

REGRESSION(r259453): [Flatpak SDK] Build directory no longer bind-mounted when running tests
https://bugs.webkit.org/show_bug.cgi?id=209960

Reviewed by Carlos Alberto Lopez Perez.

The bind-mount is always needed, not only when running build-webkit.

* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (259455 => 259456)


--- trunk/Tools/ChangeLog	2020-04-03 13:56:32 UTC (rev 259455)
+++ trunk/Tools/ChangeLog	2020-04-03 14:11:17 UTC (rev 259456)
@@ -1,3 +1,15 @@
+2020-04-03  Philippe Normand  <[email protected]>
+
+        REGRESSION(r259453): [Flatpak SDK] Build directory no longer bind-mounted when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=209960
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        The bind-mount is always needed, not only when running build-webkit.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox):
+
 2020-04-03  Diego Pino Garcia  <[email protected]>
 
         [Flatpak SDK] Create platform/Release directory only when build-webkit is called

Modified: trunk/Tools/flatpak/flatpakutils.py (259455 => 259456)


--- trunk/Tools/flatpak/flatpakutils.py	2020-04-03 13:56:32 UTC (rev 259455)
+++ trunk/Tools/flatpak/flatpakutils.py	2020-04-03 14:11:17 UTC (rev 259456)
@@ -584,10 +584,12 @@
             except OSError as e:
                 if e.errno != errno.EEXIST:
                     raise e
-            # We mount WebKitBuild/PORTNAME/BuildType to /app/webkit/WebKitBuild/BuildType
-            # so we can build WPE and GTK in a same source tree.
-            flatpak_command.append("--bind-mount=%s=%s" % (sandbox_build_path, self.build_path))
 
+        # We mount WebKitBuild/PORTNAME/BuildType to /app/webkit/WebKitBuild/BuildType
+        # so we can build WPE and GTK in a same source tree.
+        # The bind-mount is always needed, not only when running build-webkit.
+        flatpak_command.append("--bind-mount=%s=%s" % (sandbox_build_path, self.build_path))
+
         forwarded = {
             "WEBKIT_TOP_LEVEL": "/app/",
             "TEST_RUNNER_INJECTED_BUNDLE_FILENAME": os.path.join(sandbox_build_path, "lib/libTestRunnerInjectedBundle.so"),
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to