Title: [258347] trunk/Tools
- Revision
- 258347
- Author
- [email protected]
- Date
- 2020-03-12 12:01:51 -0700 (Thu, 12 Mar 2020)
Log Message
Make flatpack import for run-webkit-tests only happen on linux systems
https://bugs.webkit.org/show_bug.cgi?id=208954
Reviewed by Philippe Normand.
* Scripts/run-webkit-tests: Added an if statement to find the system platform
to determine if we need the flatpackutils import.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (258346 => 258347)
--- trunk/Tools/ChangeLog 2020-03-12 18:43:02 UTC (rev 258346)
+++ trunk/Tools/ChangeLog 2020-03-12 19:01:51 UTC (rev 258347)
@@ -1,3 +1,13 @@
+2020-03-12 Matt Lewis <[email protected]>
+
+ Make flatpack import for run-webkit-tests only happen on linux systems
+ https://bugs.webkit.org/show_bug.cgi?id=208954
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/run-webkit-tests: Added an if statement to find the system platform
+ to determine if we need the flatpackutils import.
+
2020-03-12 Alex Christensen <[email protected]>
WKWebView.hasOnlySecureContent should be correct after back/forward navigations
Modified: trunk/Tools/Scripts/run-webkit-tests (258346 => 258347)
--- trunk/Tools/Scripts/run-webkit-tests 2020-03-12 18:43:02 UTC (rev 258346)
+++ trunk/Tools/Scripts/run-webkit-tests 2020-03-12 19:01:51 UTC (rev 258347)
@@ -1,5 +1,7 @@
#!/usr/bin/env python
+
# Copyright (C) 2011 Google Inc. All rights reserved.
+# Copyright (C) 2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -34,8 +36,9 @@
from webkitpy.common import multiprocessing_bootstrap
top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
-sys.path.insert(0, os.path.join(top_level_directory, 'Tools', 'flatpak'))
-import flatpakutils
-flatpakutils.run_in_sandbox_if_available(sys.argv)
+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)
-multiprocessing_bootstrap.run('webkitpy', 'layout_tests', 'run_webkit_tests.py')
\ No newline at end of file
+multiprocessing_bootstrap.run('webkitpy', 'layout_tests', 'run_webkit_tests.py')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
