Attachment 340590 Details for Bug 185650 – Patch

[patch] Patch

bug-185650-20180517115323.patch (text/plain), 4.01 KB, created by valerie on 2018-05-17 08:53:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: valerie

Created: 2018-05-17 08:53:24 PDT

Size: 4.01 KB

patch

obsolete

>Subversion Revision: 231896
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 867b72a7460b1a469dc2ea9294872594335c3a1e..80f19fc59e2b9b7fe286d3b724a7d0c00e0beaa7 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-17  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!).
>+
>+        First, use jsc from CLI arg, then try to use webkit-build-directory,
>+        if that doesn't work, look for jsc in the $PATH
>+
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+        (getBuildPath):
>+        (runTest):
>+
> 2018-05-16  Leo Balter  <leonardo.balter@gmail.com>
> 
>         Test262-Runner: Adds a --timeout option
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 83055fdf31a6e47ee6e95d999f7ce23bb01c13f0..20b42de809e628552e1525b6114c6f066e5943f2 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -49,6 +49,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;
>@@ -233,10 +239,10 @@ 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 "Test timeout: $timeout\n" if $timeout;
>+    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;
>@@ -460,34 +466,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;
> }
>@@ -628,9 +632,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 $execTimeStart = time();
>+
>     my $result = qx($prefix $JSC $args $defaultHarness $includesfile '$prefixFile$filename');
>     my $execTime = time() - $execTimeStart;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185650: 340523 | 340525 | 340590