Title: [231919] trunk/Tools
Revision
231919
Author
commit-qu...@webkit.org
Date
2018-05-17 13:52:04 -0700 (Thu, 17 May 2018)

Log Message

test262/Runner.pm: expand $INC to find webkitdirs.pm
https://bugs.webkit.org/show_bug.cgi?id=185739

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

* Scripts/test262/Runner.pm:
(getBuildPath):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (231918 => 231919)


--- trunk/Tools/ChangeLog	2018-05-17 20:40:47 UTC (rev 231918)
+++ trunk/Tools/ChangeLog	2018-05-17 20:52:04 UTC (rev 231919)
@@ -1,3 +1,13 @@
+2018-05-17  Valerie R Young  <vale...@bocoup.com>
+
+        test262/Runner.pm: expand $INC to find webkitdirs.pm
+        https://bugs.webkit.org/show_bug.cgi?id=185739
+
+        Reviewed by Michael Saboff.
+
+        * Scripts/test262/Runner.pm:
+        (getBuildPath):
+
 2018-05-17  Carlos Alberto Lopez Perez  <clo...@igalia.com>
 
         [WPE] Implement and enable FULLSCREEN_API

Modified: trunk/Tools/Scripts/test262/Runner.pm (231918 => 231919)


--- trunk/Tools/Scripts/test262/Runner.pm	2018-05-17 20:40:47 UTC (rev 231918)
+++ trunk/Tools/Scripts/test262/Runner.pm	2018-05-17 20:52:04 UTC (rev 231919)
@@ -43,18 +43,6 @@
 use Config;
 use Time::HiRes qw(time);
 
-my $podIsAvailable;
-if  (eval {require Pod::Usage; 1;}) {
-    Pod::Usage->import();
-    $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;
@@ -65,6 +53,7 @@
     unshift @INC, "$Bin/lib";
     unshift @INC, "$Bin/local/lib/perl5";
     unshift @INC, "$Bin/local/lib/perl5/$Config{archname}";
+    unshift @INC, "$Bin/..";
 
     $ENV{LOAD_ROUTES} = 1;
 }
@@ -73,6 +62,17 @@
 use Parallel::ForkManager;
 use Getopt::Long qw(GetOptions);
 
+my $webkitdirIsAvailable;
+if (eval {require webkitdirs; 1;}) {
+    webkitdirs->import(qw(executableProductDir setConfiguration));
+    $webkitdirIsAvailable = 1;
+}
+my $podIsAvailable;
+if (eval {require Pod::Usage; 1;}) {
+    Pod::Usage->import();
+    $podIsAvailable = 1;
+}
+
 # Commandline settings
 my $max_process;
 my @cliTestDirs;
@@ -489,7 +489,7 @@
         chomp $jsc;
 
         if (! $jsc ) {
-            die("Cannot find jsc, specify with --jsc <path>.\n\n");
+            die("Cannot find jsc, try with --release or specify with --jsc <path>.\n\n");
         }
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to