Title: [273233] trunk/Tools
- Revision
- 273233
- Author
- commit-qu...@webkit.org
- Date
- 2021-02-22 02:19:07 -0800 (Mon, 22 Feb 2021)
Log Message
[Flatpak SDK] Bootstrap the run-httpd script in the SDK runtime
https://bugs.webkit.org/show_bug.cgi?id=221464
Patch by Philippe Normand <pnorm...@igalia.com> on 2021-02-22
Reviewed by Žan Doberšek.
* Scripts/run-webkit-httpd: On Linux platforms, run the script within the SDK runtime, if it
is available on the host system.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (273232 => 273233)
--- trunk/Tools/ChangeLog 2021-02-22 09:33:39 UTC (rev 273232)
+++ trunk/Tools/ChangeLog 2021-02-22 10:19:07 UTC (rev 273233)
@@ -1,3 +1,13 @@
+2021-02-22 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] Bootstrap the run-httpd script in the SDK runtime
+ https://bugs.webkit.org/show_bug.cgi?id=221464
+
+ Reviewed by Žan Doberšek.
+
+ * Scripts/run-webkit-httpd: On Linux platforms, run the script within the SDK runtime, if it
+ is available on the host system.
+
2021-02-21 Andres Gonzalez <andresg...@apple.com>
Add [WebAccessibilityObjectWrapper textMarkerRangeForNSRange] to allow clients to efficiently get a TextMarkerRange from an NSRange.
Modified: trunk/Tools/Scripts/run-webkit-httpd (273232 => 273233)
--- trunk/Tools/Scripts/run-webkit-httpd 2021-02-22 09:33:39 UTC (rev 273232)
+++ trunk/Tools/Scripts/run-webkit-httpd 2021-02-22 10:19:07 UTC (rev 273233)
@@ -28,11 +28,18 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import os
import sys
from webkitpy.layout_tests.servers.run_webkit_httpd import parse_args, run_server
+top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
+if sys.platform.startswith('linux'):
+ sys.path.insert(0, os.path.join(top_level_directory, 'Tools', 'flatpak'))
+ import flatpakutils
+ flatpakutils.run_in_sandbox_if_available(sys.argv)
+
def main(argv, stdout, stderr):
options, args = parse_args(argv)
run_server(options, args, stdout, stderr)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
