Title: [260028] trunk/Tools
- Revision
- 260028
- Author
- [email protected]
- Date
- 2020-04-13 10:56:16 -0700 (Mon, 13 Apr 2020)
Log Message
[Flatpak SDK] test262-runner fails to run with WEBKIT_JHBUILD enabled
https://bugs.webkit.org/show_bug.cgi?id=210430
Make sure we check the WEBKIT_JHBUILD env var directly to avoid
requiring webkitdirs early and messing up Runner.pm compilation.
Reviewed by Philippe Normand.
* Scripts/test262-runner:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (260027 => 260028)
--- trunk/Tools/ChangeLog 2020-04-13 17:53:51 UTC (rev 260027)
+++ trunk/Tools/ChangeLog 2020-04-13 17:56:16 UTC (rev 260028)
@@ -1,3 +1,15 @@
+2020-04-13 Lauro Moura <[email protected]>
+
+ [Flatpak SDK] test262-runner fails to run with WEBKIT_JHBUILD enabled
+ https://bugs.webkit.org/show_bug.cgi?id=210430
+
+ Make sure we check the WEBKIT_JHBUILD env var directly to avoid
+ requiring webkitdirs early and messing up Runner.pm compilation.
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/test262-runner:
+
2020-04-13 David Kilzer <[email protected]>
Add WARN_UNUSED_RETURN to decode methods in Source/WebKit
Modified: trunk/Tools/Scripts/test262-runner (260027 => 260028)
--- trunk/Tools/Scripts/test262-runner 2020-04-13 17:53:51 UTC (rev 260027)
+++ trunk/Tools/Scripts/test262-runner 2020-04-13 17:56:16 UTC (rev 260028)
@@ -38,8 +38,14 @@
use lib $FindBin::Bin;
use File::Spec::Functions qw(catfile);
+ my $want_jhbuild = 0;
+
+ if (defined $ENV{'WEBKIT_JHBUILD'}) {
+ $want_jhbuild = $ENV{'WEBKIT_JHBUILD'};
+ }
+
my $osName = $Config{osname};
- if ($osName eq "linux" && !grep(/^--no-flatpak-check$/, @ARGV)) {
+ if (!$want_jhbuild && $osName eq "linux" && !grep(/^--no-flatpak-check$/, @ARGV)) {
if (eval {require webkitdirs; 1;}) {
webkitdirs->import(qw(shouldUseFlatpak runInFlatpak sourceDir));
if (shouldUseFlatpak()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
