Attachment 339446 Details for Bug 185250 – Patch

[patch] Patch

bug-185250-20180503155640.patch (text/plain), 3.24 KB, created by valerie on 2018-05-03 12:56:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: valerie

Created: 2018-05-03 12:56:41 PDT

Size: 3.24 KB

patch

obsolete

>Subversion Revision: 231319
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c8f57a9d138c44d92f0adde87a6dc573d837fed4..6af695f10744ecd8f7850ea83545acac784779d3 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-03  Valerie R Young  <valerie@bocoup.com>
>+
>+        test262/Runner.pm: minor fixes
>+        https://bugs.webkit.org/show_bug.cgi?id=185250
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add comments, change output and fix bug: unintended interpolation
>+        of filename when running jsc.
>+
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+        (main):
>+        (runTest):
>+
> 2018-05-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [WinCairo] Add JSC test bots
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 8d3d19f5df3b799f3ca36f7c29bfc5406640ad5c..67cd8ba9006ce73d4ce5c1ed6f4aae7e9b1cf030 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -61,9 +61,8 @@ use YAML qw(Load LoadFile Dump DumpFile Bless);
> use Parallel::ForkManager;
> use Getopt::Long qw(GetOptions);
> use Pod::Usage;
>-use Term::ANSIColor;
> 
>-# Commandline args
>+# Commandline settings
> my $max_process;
> my @cliTestDirs;
> my $verbose;
>@@ -79,7 +78,11 @@ my $saveExpectations;
> 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");
>@@ -87,8 +90,6 @@ my $resultsFile = abs_path("$Bin/results.yaml");
> my $summaryTxtFile = abs_path("$Bin/results-summary.txt");
> my $summaryFile = abs_path("$Bin/results-summary.yaml");
> 
>-processCLI();
>-
> my $tempdir = tempdir();
> 
> my @default_harnesses = (
>@@ -98,8 +99,6 @@ my @default_harnesses = (
>     "$Bin/agent.js"
> );
> 
>-my @files;
>-
> my ($deffh, $deffile) = getTempFile();
> print $deffh getHarness(<@default_harnesses>);
> 
>@@ -156,8 +155,6 @@ sub processCLI {
>         }
>     } else {
>         $JSC = getBuildPath($debug);
>-
>-        print("Using the following jsc path: $JSC\n");
>     }
> 
>     if ($latestImport) {
>@@ -219,6 +216,8 @@ sub processCLI {
> }
> 
> sub main {
>+
>+    # If not commandline test path supplied, use the root directory of all tests.
>     push(@cliTestDirs, 'test') if not @cliTestDirs;
> 
>     if ($latestImport) {
>@@ -242,7 +241,7 @@ sub main {
> 
> 
>     # If we are processing many files, fork process
>-    if (scalar @files > $max_process * 10) {
>+    if (scalar @files > $max_process * 5) {
> 
>         # Make temporary files to record results
>         my @resultsfhs;
>@@ -578,7 +577,7 @@ sub runTest {
>     my $defaultHarness = '';
>     $defaultHarness = $deffile if $scenario ne 'raw';
> 
>-    my $result = qx/$JSC $args $defaultHarness $includesfile $prefixFile$filename/;
>+    my $result = qx/$JSC $args $defaultHarness $includesfile '$prefixFile$filename'/;
> 
>     chomp $result;
> 
>@@ -857,7 +856,7 @@ Specify one or more specific test262 directory of test to run, relative to the r
> 
> =item B<--save, -s>
> 
>-Overwrites the test262-expectations.yaml and test262-results.yaml file with the current list of test262 files and test results.
>+Overwrites the test262-expectations.yaml file with the current list of test262 files and test results.
> 
> =item B<--ignore-expectations, -x>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185250: 339446