Attachment 339457 Details for Bug 185263 – Patch

[patch] Patch

bug-185263-20180503175555.patch (text/plain), 2.76 KB, created by Leo Balter on 2018-05-03 13:55:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Balter

Created: 2018-05-03 13:55:56 PDT

Size: 2.76 KB

patch

obsolete

>Subversion Revision: 231323
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7b8c63ae0abce08dc00b4885eb5157c4e04db8d8..8a2caa6b47ed05e24408e7db8821a1f7cf56503c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-03  Leo Balter  <leonardo.balter@gmail.com>
>+
>+        cleanup modules usage for the Test262-Runner
>+        https://bugs.webkit.org/show_bug.cgi?id=185263
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/test262-runner:
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+
> 2018-05-03  Valerie R Young  <valerie@bocoup.com>
> 
>         test262/Runner.pm: minor fixes
>diff --git a/Tools/Scripts/test262-runner b/Tools/Scripts/test262-runner
>index 8d3c8eb601cb1103103808f27b1b8af9f49c915b..a131bcf633e30d9765fb562425073117a98f2238 100755
>--- a/Tools/Scripts/test262-runner
>+++ b/Tools/Scripts/test262-runner
>@@ -33,7 +33,6 @@ use 5.8.8;
> 
> use FindBin;
> use Config;
>-use Encode;
> 
> BEGIN {
>     $ENV{DBIC_OVERWRITE_HELPER_METHODS_OK} = 1;
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 67cd8ba9006ce73d4ce5c1ed6f4aae7e9b1cf030..4237601987d97a53b40ddd8112f8a917c9c5a7c7 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -39,11 +39,15 @@ use File::Basename qw(dirname);
> use Cwd qw(abs_path);
> use FindBin;
> use Env qw(DYLD_FRAMEWORK_PATH);
>-my $Bin;
>-
> use Config;
>-use Encode;
> 
>+my $podIsAvailable;
>+if  (eval {require Pod::Usage; 1;}) {
>+    Pod::Usage->import();
>+    $podIsAvailable = 1;
>+}
>+
>+my $Bin;
> BEGIN {
>     $ENV{DBIC_OVERWRITE_HELPER_METHODS_OK} = 1;
> 
>@@ -60,7 +64,6 @@ BEGIN {
> use YAML qw(Load LoadFile Dump DumpFile Bless);
> use Parallel::ForkManager;
> use Getopt::Long qw(GetOptions);
>-use Pod::Usage;
> 
> # Commandline settings
> my $max_process;
>@@ -79,17 +82,15 @@ my $failingOnly;
> my $latestImport;
> my $runningAllTests;
> 
>-processCLI();
>-
>-my @results;
>-my @files;
>-
> my $expectationsFile = abs_path("$Bin/expectations.yaml");
> my $configFile = abs_path("$Bin/config.yaml");
> my $resultsFile = abs_path("$Bin/results.yaml");
> my $summaryTxtFile = abs_path("$Bin/results-summary.txt");
> my $summaryFile = abs_path("$Bin/results-summary.yaml");
> 
>+my @results;
>+my @files;
>+
> my $tempdir = tempdir();
> 
> my @default_harnesses = (
>@@ -104,6 +105,7 @@ print $deffh getHarness(<@default_harnesses>);
> 
> my $startTime = time();
> 
>+processCLI();
> main();
> 
> sub processCLI {
>@@ -134,7 +136,12 @@ sub processCLI {
>     );
> 
>     if ($help) {
>-        pod2usage(-exitstatus => 0, -verbose => 2, -input => __FILE__);
>+        if ($podIsAvailable) {
>+            pod2usage(-exitstatus => 0, -verbose => 2, -input => __FILE__);
>+        } else {
>+            print "Pod::Usage is not available to print the help options\n";
>+            exit;
>+        }
>     }
> 
>     if ($stats) {

Actions: View | Formatted Diff | Diff

Attachments on bug 185263: 339450 | 339452 | 339455 | 339457