Changeset 231919 in webkit


Ignore:
Timestamp:
May 17, 2018 1:52:04 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

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

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

  • Scripts/test262/Runner.pm:

(getBuildPath):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r231917 r231919  
     12018-05-17  Valerie R Young  <valerie@bocoup.com>
     2
     3        test262/Runner.pm: expand $INC to find webkitdirs.pm
     4        https://bugs.webkit.org/show_bug.cgi?id=185739
     5
     6        Reviewed by Michael Saboff.
     7
     8        * Scripts/test262/Runner.pm:
     9        (getBuildPath):
     10
    1112018-05-17  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    212
  • trunk/Tools/Scripts/test262/Runner.pm

    r231908 r231919  
    4444use Time::HiRes qw(time);
    4545
    46 my $podIsAvailable;
    47 if  (eval {require Pod::Usage; 1;}) {
    48     Pod::Usage->import();
    49     $podIsAvailable = 1;
    50 }
    51 
    52 my $webkitdirIsAvailable;
    53 if  (eval {require webkitdirs; 1;}) {
    54     webkitdirs->import(qw(executableProductDir setConfiguration));
    55     $webkitdirIsAvailable = 1;
    56 }
    57 
    5846my $Bin;
    5947BEGIN {
     
    6654    unshift @INC, "$Bin/local/lib/perl5";
    6755    unshift @INC, "$Bin/local/lib/perl5/$Config{archname}";
     56    unshift @INC, "$Bin/..";
    6857
    6958    $ENV{LOAD_ROUTES} = 1;
     
    7362use Parallel::ForkManager;
    7463use Getopt::Long qw(GetOptions);
     64
     65my $webkitdirIsAvailable;
     66if (eval {require webkitdirs; 1;}) {
     67    webkitdirs->import(qw(executableProductDir setConfiguration));
     68    $webkitdirIsAvailable = 1;
     69}
     70my $podIsAvailable;
     71if (eval {require Pod::Usage; 1;}) {
     72    Pod::Usage->import();
     73    $podIsAvailable = 1;
     74}
    7575
    7676# Commandline settings
     
    490490
    491491        if (! $jsc ) {
    492             die("Cannot find jsc, specify with --jsc <path>.\n\n");
     492            die("Cannot find jsc, try with --release or specify with --jsc <path>.\n\n");
    493493        }
    494494    }
Note: See TracChangeset for help on using the changeset viewer.