Attachment 346931 Details for Bug 188450 – Patch

[patch] Patch

bug-188450-20180810145831.patch (text/plain), 2.72 KB, created by Keith Miller on 2018-08-10 14:58:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Miller

Created: 2018-08-10 14:58:32 PDT

Size: 2.72 KB

patch

obsolete

>Subversion Revision: 234770
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cf2a4a57e25ccac46386d887f9696e18ce930765..855f35ce5ae422a464d15eb97ef4d31eaea9aa3a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-10  Keith Miller  <keith_miller@apple.com>
>+
>+        test262-runner -s --test-only should replace test results
>+        https://bugs.webkit.org/show_bug.cgi?id=188450
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/test262/Runner.pm:
>+        (main):
>+        (SetFailureForTest):
>+        (UpdateResults):
>+
> 2018-08-10  Daniel Bates  <dabates@apple.com>
> 
>         webkit-patch setup-git-clone should set Git core editor to commit-log-editor
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 3fe2f4f3c40099458e51515403b2eb6ac23441fc..f4cd5eecf28b9cd09194653ae9d903a1076c899f 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -443,14 +443,7 @@ sub main {
>             $failcount++;
> 
>             # Record this round of failures
>-            if ( $failed{$test->{path}} ) {
>-                $failed{$test->{path}}->{$test->{mode}} =  $test->{error};
>-            }
>-            else {
>-                $failed{$test->{path}} = {
>-                    $test->{mode} => $test->{error}
>-                };
>-            }
>+            SetFailureForTest(\%failed, $test);
> 
>             # If an unexpected failure
>             if (!$expectedFailure || ($expectedFailure ne $test->{error})) {
>@@ -520,6 +513,9 @@ sub main {
>     }
> 
>     if ($saveExpectations) {
>+        if (!$runningAllTests) {
>+            UpdateResults($expect, \@results, \%failed);
>+        }
>         DumpFile($expectationsFile, \%failed);
>         print "Saved expectation file in: $expectationsFile\n";
>     }
>@@ -908,6 +904,42 @@ sub getHarness {
>     return $content || '';
> }
> 
>+sub SetFailureForTest {
>+    my ($failed, $test) = @_;
>+
>+    if ($failed->{$test->{path}}) {
>+        $failed->{$test->{path}}->{$test->{mode}} = $test->{error};
>+    }
>+    else {
>+        $failed->{$test->{path}} = {
>+            $test->{mode} => $test->{error}
>+        };
>+    }
>+}
>+
>+sub UpdateResults {
>+    print "Updating results... \n";
>+
>+    my ($expect, $results, $failed) = @_;
>+
>+    foreach my $test (@{$results}) {
>+        delete $expect->{$test->{path}};
>+    }
>+
>+    foreach my $path (keys($expect)) {
>+        foreach my $mode (keys($expect->{$path})) {
>+            my $test = {
>+                path => $path,
>+                mode => $mode,
>+                error => $expect->{$path}->{$mode},
>+                result => 'FAIL'
>+            };
>+
>+            SetFailureForTest($failed, $test);
>+        }
>+    }
>+}
>+
> sub summarizeResults {
>     print "Summarizing results...\n";
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188450: 346931