Attachment 340525 Details for Bug 185650 – Patch

[patch] Patch

bug-185650-20180516173831.patch (text/plain), 3.86 KB, created by valerie on 2018-05-16 14:38:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: valerie

Created: 2018-05-16 14:38:32 PDT

Size: 3.86 KB

patch

obsolete

>Subversion Revision: 231847
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a043f4b68f9a905e82c0d70d14ff94ccb021e7d9..f8e5f7392f2496faf2db814bc4cb0f4060e5d3b9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-16  Valerie R Young  <valerie@bocoup.com>
>+
>+        test262/Runner.pm: look for jsc in path if cannot call webkit-build-directory
>+        https://bugs.webkit.org/show_bug.cgi?id=185650
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Try to find jsc via webkitdirs.pm. If cannot find,
>+        or webkitdirs.pm will not load, then look for jsc in path.
>+
>+        * Scripts/test262/Runner.pm:
>+        (getBuildPath):
>+
> 2018-05-15  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r231763.
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 7155b56db90b177a4d33c4e990c5adeef539fa29..bdc81f9829e7a1696a8e45540304402086aea5ed 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -48,6 +48,12 @@ if  (eval {require Pod::Usage; 1;}) {
>     $podIsAvailable = 1;
> }
> 
>+my $webkitdirIsAvailable;
>+if  (eval {require webkitdirs; 1;}) {
>+    webkitdirs->import(qw(executableProductDir setConfiguration));
>+    $webkitdirIsAvailable = 1;
>+}
>+
> my $Bin;
> BEGIN {
>     $ENV{DBIC_OVERWRITE_HELPER_METHODS_OK} = 1;
>@@ -229,9 +235,8 @@ sub processCLI {
>     print "\n-------------------------Settings------------------------\n"
>         . "Test262 Dir: $test262Dir\n"
>         . "JSC: $JSC\n"
>-        . "DYLD_FRAMEWORK_PATH: $DYLD_FRAMEWORK_PATH\n"
>         . "Child Processes: $max_process\n";
>-
>+    print "DYLD_FRAMEWORK_PATH: $DYLD_FRAMEWORK_PATH\n" if $DYLD_FRAMEWORK_PATH;
>     print "Features to include: " . join(', ', @features) . "\n" if @features;
>     print "Paths:  " . join(', ', @cliTestDirs) . "\n" if @cliTestDirs;
>     print "Config file: $configFile\n" if $config;
>@@ -457,34 +462,32 @@ sub parseError {
> }
> 
> sub getBuildPath {
>-    my $release = shift;
>+    my ($release) = @_;
> 
>-    # Try to find JSC for user, if not supplied
>-    my $cmd = abs_path("$Bin/../webkit-build-directory");
>-    if (! -e $cmd) {
>-        die 'Error: cannot find webkit-build-directory, specify with JSC with --jsc <path>.';
>-    }
>+    my $jsc;
> 
>-    if ($release) {
>-        $cmd .= ' --release';
>-    } else {
>-        $cmd .= ' --debug';
>-    }
>-    $cmd .= ' --executablePath';
>-    my $jscDir = qx($cmd);
>-    chomp $jscDir;
>+    if ($webkitdirIsAvailable) {
>+        my $config = $release ? 'Release' : 'Debug';
>+        setConfiguration($config);
>+        my $jscDir = executableProductDir();
> 
>-    my $jsc;
>-    $jsc = $jscDir . '/jsc';
>+        $jsc = $jscDir . '/jsc';
>+        $jsc = $jscDir . '/JavaScriptCore.framework/Resources/jsc' if (! -e $jsc);
>+        $jsc = $jscDir . '/bin/jsc' if (! -e $jsc);
> 
>-    $jsc = $jscDir . '/JavaScriptCore.framework/Resources/jsc' if (! -e $jsc);
>-    $jsc = $jscDir . '/bin/jsc' if (! -e $jsc);
>-    if (! -e $jsc) {
>-        die 'Error: cannot find jsc, specify with --jsc <path>.';
>+        # Sets the Env DYLD_FRAMEWORK_PATH
>+        $DYLD_FRAMEWORK_PATH = dirname($jsc) if (-e $jsc);
>     }
> 
>-    # Sets the Env DYLD_FRAMEWORK_PATH
>-    $DYLD_FRAMEWORK_PATH = dirname($jsc);
>+    if (! $jsc || ! -e $jsc) {
>+        # If we cannot find jsc using webkitdirs, look in path
>+        $jsc = qx(which jsc);
>+        chomp $jsc;
>+
>+        if (! $jsc ) {
>+            die("Cannot find jsc, specify with --jsc <path>.\n\n");
>+        }
>+    }
> 
>     return $jsc;
> }
>@@ -621,7 +624,9 @@ sub runTest {
>     my $defaultHarness = '';
>     $defaultHarness = $deffile if $scenario ne 'raw';
> 
>-    my $prefix = qq(DYLD_FRAMEWORK_PATH=$DYLD_FRAMEWORK_PATH);
>+    my $prefix = $DYLD_FRAMEWORK_PATH
>+        ? 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 185650: 340523 | 340525 | 340590