Attachment 340623 Details for Bug 185739 – Patch

[patch] Patch

bug-185739-20180517152219.patch (text/plain), 2.27 KB, created by valerie on 2018-05-17 12:22:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: valerie

Created: 2018-05-17 12:22:19 PDT

Size: 2.27 KB

patch

obsolete

>Subversion Revision: 231914
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index face07243ccfc752eb44f26ae15c1f6e5149288b..e252f6f028390922973dde0dac146c3e4418ed37 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-17  Valerie R Young  <valerie@bocoup.com>
>+
>+        test262/Runner.pm: expand $INC to find webkitdirs.pm
>+        https://bugs.webkit.org/show_bug.cgi?id=185739
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/test262/Runner.pm:
>+        (getBuildPath):
>+
> 2018-05-17  Brendan McLoughlin  <brendan@bocoup.com>
> 
>         Export changes to web-platform-test as part of the webkit-patch upload workflow
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 20b42de809e628552e1525b6114c6f066e5943f2..ec30d01fd4cd58365d2ba0cac2e3156d2959b619 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -43,18 +43,6 @@ use Env qw(DYLD_FRAMEWORK_PATH);
> 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 @@ BEGIN {
>     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 YAML qw(Load LoadFile Dump DumpFile Bless);
> 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 @@ sub getBuildPath {
>         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");
>         }
>     }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185739: 340623