Attachment 343070 Details for Bug 186808 – Patch

[patch] Patch

bug-186808-20180619141514.patch (text/plain), 4.36 KB, created by Leo Balter on 2018-06-19 11:15:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Balter

Created: 2018-06-19 11:15:15 PDT

Size: 4.36 KB

patch

obsolete

>Subversion Revision: 232966
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ad1ec70158d259132d3fc40590dc5328c80fc207..bbbc6a30620edb91d63e214e51fadf9029211df0 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-19  Leo Balter  <leonardo.balter@gmail.com>
>+
>+        [test262-runner] Always save the expectations file in full runs
>+        https://bugs.webkit.org/show_bug.cgi?id=186808
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The runner should always save the expectations file in full runs, this can be easily
>+        controlled using versioning control and enforces a good practice to keep the expectations
>+        file up to date with the latest runs.
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+        (main):
>+
> 2018-06-19  Robin Morisset  <rmorisset@apple.com>
> 
>         [WSL] Improving the typing rules
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 7c73d5f1035a8a40f3ed7a4df09f0f12b47d0da5..dc38b421173d3c3e8f991cd45b0db255c4caf30e 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -84,7 +84,6 @@ my $ignoreConfig;
> my $config;
> my %configSkipHash;
> my $expect;
>-my $saveExpectations;
> my $failingOnly;
> my $latestImport;
> my $runningAllTests;
>@@ -133,7 +132,6 @@ sub processCLI {
>         'f|features=s@' => \@features,
>         'c|config=s' => \$configFile,
>         'i|ignore-config' => \$ignoreConfig,
>-        's|save' => \$saveExpectations,
>         'e|expectations=s' => \$specifiedExpectationsFile,
>         'x|ignore-expectations' => \$ignoreExpectations,
>         'F|failing-files' => \$failingOnly,
>@@ -141,7 +139,7 @@ sub processCLI {
>         'stats' => \$stats,
>         'r|results=s' => \$specifiedResultsFile,
>         'timeout=i' => \$timeout,
>-        'S|skipped-files' => \$skippedOnly,
>+        's|skipped-files' => \$skippedOnly,
>     );
> 
>     if ($help) {
>@@ -291,8 +289,11 @@ sub main {
> 
>     print $deffh getHarness(\@defaultHarnessFiles);
> 
>-    # If not commandline test path supplied, use the root directory of all tests.
>-    push(@cliTestDirs, 'test') if not @cliTestDirs;
>+    if (!@cliTestDirs) {
>+        # Use the root directory of all tests if not test path supplied from the cli.
>+        push(@cliTestDirs, 'test');
>+        $runningAllTests = 1;
>+    }
> 
>     if ($latestImport) {
>         @files = loadImportFile();
>@@ -300,7 +301,6 @@ sub main {
>         # If we only want to re-run failure, only run tests in results file
>         findAllFailing();
>     } else {
>-        $runningAllTests = 1;
>         # Otherwise, get all files from directory
>         foreach my $testsDir (@cliTestDirs) {
>             find(
>@@ -447,21 +447,21 @@ sub main {
> 
>     print("\n");
> 
>-    if ($saveExpectations) {
>+    if ($runningAllTests) {
>         DumpFile($expectationsFile, \%failed);
>         print "Saved expectation file in: $expectationsFile\n";
>     }
>-    if ($runningAllTests) {
>-        if (! -e $resultsDir) {
>-            mkpath($resultsDir);
>-        }
>-        $resultsFile = abs_path("$resultsDir/results.yaml");
> 
>-        DumpFile($resultsFile, \@results);
>-        print "Saved all the results in $resultsFile\n";
>-        summarizeResults();
>+    if (! -e $resultsDir) {
>+        mkpath($resultsDir);
>     }
> 
>+    $resultsFile = abs_path("$resultsDir/results.yaml");
>+    DumpFile($resultsFile, \@results);
>+    print "Saved all the results in $resultsFile\n";
>+
>+    summarizeResults();
>+
>     my $total = scalar @results - $skipfilecount;
>     print "\n" . $total . " tests ran\n";
> 
>@@ -1069,10 +1069,6 @@ Filter test on list of features (only runs tests in feature list).
> 
> Specify one or more specific test262 directory of test to run, relative to the root test262 directory. For example, --test-only 'test/built-ins/Number/prototype'
> 
>-=item B<--save, -s>
>-
>-Overwrites the test262-expectations.yaml file with the current list of test262 files and test results.
>-
> =item B<--expectations, -e>
> 
> Specify a expectations file for loading and saving.  If not provided, script will load and save to JSTests/test262/expectations.yaml.
>@@ -1089,7 +1085,7 @@ Runs all test files that failed in a given results file (specifc with --results)
> 
> Runs the test files listed in the last import (./JSTests/test262/latest-changes-summary.txt).
> 
>-=item B<--skipped-files, -S>
>+=item B<--skipped-files, -s>
> 
> Runs all test files that are skipped according to the config.yaml file.
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186808: 343070