Title: [239767] trunk/Tools
- Revision
- 239767
- Author
- ph...@webkit.org
- Date
- 2019-01-09 02:59:45 -0800 (Wed, 09 Jan 2019)
Log Message
[WPE] API tests can't run in flatpak environment
https://bugs.webkit.org/show_bug.cgi?id=193242
Reviewed by Michael Catanzaro.
* Scripts/run-wpe-tests: Add --wpe to arguments passed to
flatpakutils so that it knows which port it's dealing with.
* glib/common.py: Remove build_dir globals so that subsequent
calls actually take args into account.
(library_build_path):
(binary_build_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (239766 => 239767)
--- trunk/Tools/ChangeLog 2019-01-09 08:34:15 UTC (rev 239766)
+++ trunk/Tools/ChangeLog 2019-01-09 10:59:45 UTC (rev 239767)
@@ -1,3 +1,17 @@
+2019-01-09 Philippe Normand <pnorm...@igalia.com>
+
+ [WPE] API tests can't run in flatpak environment
+ https://bugs.webkit.org/show_bug.cgi?id=193242
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/run-wpe-tests: Add --wpe to arguments passed to
+ flatpakutils so that it knows which port it's dealing with.
+ * glib/common.py: Remove build_dir globals so that subsequent
+ calls actually take args into account.
+ (library_build_path):
+ (binary_build_path):
+
2019-01-08 Dean Jackson <d...@apple.com>
Blob references for System Previews don't get a correct file extension
Modified: trunk/Tools/Scripts/run-wpe-tests (239766 => 239767)
--- trunk/Tools/Scripts/run-wpe-tests 2019-01-09 08:34:15 UTC (rev 239766)
+++ trunk/Tools/Scripts/run-wpe-tests 2019-01-09 10:59:45 UTC (rev 239767)
@@ -44,7 +44,7 @@
if __name__ == "__main__":
- flatpakutils.run_in_sandbox_if_available(sys.argv)
+ flatpakutils.run_in_sandbox_if_available([sys.argv[0], "--wpe"] + sys.argv[1:])
if not flatpakutils.is_sandboxed() and not jhbuildutils.enter_jhbuild_environment_if_available("wpe"):
print '***'
print '*** Warning: jhbuild environment not present and not running in flatpak.'
@@ -55,8 +55,12 @@
add_options(option_parser);
option_parser.add_option('--display-server', choices=['headless', 'wayland'], default='headless',
help='"headless": Use headless view backend. "wayland": Use the current wayland session.'),
- options, args = option_parser.parse_args()
+ args = sys.argv[1:]
+ if flatpakutils.is_sandboxed():
+ args = [ arg for arg in args if arg != "--wpe" ]
+ options, args = option_parser.parse_args(args)
+
logging.basicConfig(level=logging.INFO, format="%(message)s")
runner = WPETestRunner(options, args)
Modified: trunk/Tools/glib/common.py (239766 => 239767)
--- trunk/Tools/glib/common.py 2019-01-09 08:34:15 UTC (rev 239766)
+++ trunk/Tools/glib/common.py 2019-01-09 10:59:45 UTC (rev 239767)
@@ -23,8 +23,6 @@
top_level_dir = None
build_dir = None
-library_build_dir = None
-binary_build_dir = None
build_types = ('Release', 'Debug')
@@ -41,17 +39,11 @@
def library_build_path(*args):
- global library_build_dir
- if not library_build_dir:
- library_build_dir = build_path('lib', *args)
- return library_build_dir
+ return build_path('lib', *args)
def binary_build_path(*args):
- global binary_build_dir
- if not binary_build_dir:
- binary_build_dir = build_path('bin', *args)
- return binary_build_dir
+ return build_path('bin', *args)
def get_build_path(fatal=True):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
