Changeset 231908 in webkit

Timestamp:

May 17, 2018 10:07:46 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

test262/Runner.pm: look for jsc in path if cannot call webkit-build-directory
​https://bugs.webkit.org/show_bug.cgi?id=185650

Patch by Valerie R Young <​valerie@bocoup.com> on 2018-05-17
Reviewed by Michael Saboff.

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/test262/Runner.pm (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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 Michael Saboff.
+
+        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>
 

trunk/Tools/Scripts/test262/Runner.pm

@@ -50 +50 @@
 }
 
+my $webkitdirIsAvailable;
+if  (eval {require webkitdirs; 1;}) {
+    webkitdirs->import(qw(executableProductDir setConfiguration));
+    $webkitdirIsAvailable = 1;
+}
+
 my $Bin;
 BEGIN {
@@ -234 +240 @@
         . "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;
@@ -461 +467 @@
 
 sub getBuildPath {
-    my $release = shift;
-
-    # 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>.';
-    }
-
-    if ($release) {
-        $cmd .= ' --release';
-    } else {
-        $cmd .= ' --debug';
-    }
-    $cmd .= ' --executablePath';
-    my $jscDir = qx($cmd);
-    chomp $jscDir;
+    my ($release) = @_;
 
     my $jsc;
-    $jsc = $jscDir . '/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 ($webkitdirIsAvailable) {
+        my $config = $release ? 'Release' : 'Debug';
+        setConfiguration($config);
+        my $jscDir = executableProductDir();
+
+        $jsc = $jscDir . '/jsc';
+        $jsc = $jscDir . '/JavaScriptCore.framework/Resources/jsc' if (! -e $jsc);
+        $jsc = $jscDir . '/bin/jsc' if (! -e $jsc);
+
+        # Sets the Env DYLD_FRAMEWORK_PATH
+        $DYLD_FRAMEWORK_PATH = dirname($jsc) if (-e $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;
@@ -629 +633 @@
     $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;