Attachment 340017 Details for Bug 185488 – Patch

[patch] Patch

bug-185488-20180509174356.patch (text/plain), 2.26 KB, created by Leo Balter on 2018-05-09 13:43:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Balter

Created: 2018-05-09 13:43:57 PDT

Size: 2.26 KB

patch

obsolete

>Subversion Revision: 231588
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 3c2c06aaf8f216a3821c00c2d506defb73497e63..bdb70789e162d3530c635b3967c5dedb5a996194 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-09  Leo Balter  <leonardo.balter@gmail.com>
>+
>+        Fix Test262 Runner to have DYLD_FRAMEWORK_PATH always set
>+        https://bugs.webkit.org/show_bug.cgi?id=185488
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+        (getBuildPath):
>+        (runTest):
>+
> 2018-05-09  Thibault Saunier  <tsaunier@igalia.com>
> 
>         [tests][GStreamer]: Pass USE_PLAYBIN3 to the tests subprocess
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index d79a3e0c132677c7f346ff428548a341431ac610..be4cfc6baca57ec3a5484ab8ec573fda5b9bb420 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -39,7 +39,6 @@ use File::Basename qw(dirname);
> use File::Path qw(mkpath);
> use Cwd qw(abs_path);
> use FindBin;
>-use Env qw(DYLD_FRAMEWORK_PATH);
> use Config;
> 
> my $podIsAvailable;
>@@ -82,6 +81,7 @@ my $saveExpectations;
> my $failingOnly;
> my $latestImport;
> my $runningAllTests;
>+my $DYLD_FRAMEWORK_PATH;
> 
> my $expectationsFile = abs_path("$Bin/../../../JSTests/test262/expectations.yaml");
> my $configFile = abs_path("$Bin/../../../JSTests/test262/config.yaml");
>@@ -172,10 +172,7 @@ sub processCLI {
>             die "Error: --jsc path does not exist.";
>         }
> 
>-        # For custom JSC paths, Sets only if not yet defined
>-        if (not defined $DYLD_FRAMEWORK_PATH) {
>-            $DYLD_FRAMEWORK_PATH = dirname($JSC);
>-        }
>+        $DYLD_FRAMEWORK_PATH = dirname($JSC);
>     } else {
>         $JSC = getBuildPath($debug);
>     }
>@@ -466,6 +463,7 @@ sub getBuildPath {
>     my $jscDir = qx($cmd);
>     chomp $jscDir;
> 
>+
>     my $jsc;
>     $jsc = $jscDir . '/jsc';
> 
>@@ -613,7 +611,8 @@ sub runTest {
>     my $defaultHarness = '';
>     $defaultHarness = $deffile if $scenario ne 'raw';
> 
>-    my $result = qx/$JSC $args $defaultHarness $includesfile '$prefixFile$filename'/;
>+    my $prefix = qq(DYLD_FRAMEWORK_PATH=$DYLD_FRAMEWORK_PATH);
>+    my $result = qx($prefix $JSC $args $defaultHarness $includesfile '$prefixFile$filename');
> 
>     chomp $result;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185488: 340017 | 340018 | 340019