Attachment 340218 Details for Bug 185562 – Patch

[patch] Patch

bug-185562-20180511173740.patch (text/plain), 4.36 KB, created by Leo Balter on 2018-05-11 13:37:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Balter

Created: 2018-05-11 13:37:42 PDT

Size: 4.36 KB

patch

obsolete

>Subversion Revision: 231715
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 39cc15de17398866f4c5b3e9317cbe4bfd6682c6..6ebf35ce2f686d698435207d087e15b6d5708504 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-05-11  Leo Balter  <leonardo.balter@gmail.com>
>+
>+        Test262 Runner should search for the Debug JSC by default
>+        https://bugs.webkit.org/show_bug.cgi?id=185562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The Test262 Runner is now searching for the Debug build of JSC by
>+        default, not the Release build.
>+
>+        This fix allows a similar call from the previous runner, making
>+        it compatible with the current build bot configuration parameters.
>+
>+        This patch also adds some minor improvements the verbose mode output.
>+
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+        (main):
>+        (getBuildPath):
>+        (processResult):
>+
> 2018-05-11  Charles Vazac  <cvazac@gmail.com>
> 
>         Runtime feature flag for Server-Timing
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 46a7cad72e874b86c09dd1ddaa120948b8d60066..523e006883b4c3a5c2b14c859274936e17237bd5 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -107,7 +107,7 @@ main();
> 
> sub processCLI {
>     my $help = 0;
>-    my $debug;
>+    my $release;
>     my $ignoreExpectations;
>     my @features;
>     my $stats;
>@@ -122,7 +122,7 @@ sub processCLI {
>         'o|test-only=s@' => \@cliTestDirs,
>         'p|child-processes=i' => \$max_process,
>         'h|help' => \$help,
>-        'd|debug' => \$debug,
>+        'release' => \$release,
>         'v|verbose' => \$verbose,
>         'f|features=s@' => \@features,
>         'c|config=s' => \$configFile,
>@@ -177,7 +177,7 @@ sub processCLI {
>             $DYLD_FRAMEWORK_PATH = dirname($JSC);
>         }
>     } else {
>-        $JSC = getBuildPath($debug);
>+        $JSC = getBuildPath($release);
>     }
> 
>     if ($latestImport) {
>@@ -278,7 +278,6 @@ sub main {
>         }
>     }
> 
>-
>     # If we are processing many files, fork process
>     if (scalar @files > $max_process * 5) {
> 
>@@ -457,7 +456,7 @@ sub parseError {
> }
> 
> sub getBuildPath {
>-    my $debug = shift;
>+    my $release = shift;
> 
>     # Try to find JSC for user, if not supplied
>     my $cmd = abs_path("$Bin/../webkit-build-directory");
>@@ -465,16 +464,15 @@ sub getBuildPath {
>         die 'Error: cannot find webkit-build-directory, specify with JSC with --jsc <path>.';
>     }
> 
>-    if ($debug) {
>-        $cmd .= ' --debug';
>-    } else {
>+    if ($release) {
>         $cmd .= ' --release';
>+    } else {
>+        $cmd .= ' --debug';
>     }
>     $cmd .= ' --executablePath';
>     my $jscDir = qx($cmd);
>     chomp $jscDir;
> 
>-
>     my $jsc;
>     $jsc = $jscDir . '/jsc';
> 
>@@ -653,17 +651,23 @@ sub processResult {
> 
>         # Print the failure if we haven't loaded an expectation file
>         # or the failure is new.
>-        my $printfailure = !$expect || $isnewfailure;
>+        my $printFailure = !$expect || $isnewfailure;
>+
>+        my $newFail = '';
>+        $newFail = '! NEW ' if $isnewfailure;
>+        my $failMsg = '';
>+        $failMsg = "FAIL $file ($scenario)\n" if ($printFailure or $verbose);
>+
>+        my $suffixMsg = '';
> 
>         if ($verbose) {
>-            print "! NEW FAIL $file ($scenario)\n$result";
>-            print "\nFeatures: " . join(', ', @{ $data->{features} }) if $data->{features};
>-            print "\n\n";
>-        } else {
>-            print "! NEW " if $isnewfailure;
>-            print "FAIL $file ($scenario)\n" if $printfailure;
>+            my $featuresList = '';
>+            $featuresList = "\nFeatures: " . join(', ', @{ $data->{features} }) if $data->{features};
>+            $suffixMsg = "$result$featuresList\n\n";
>         }
> 
>+        print "$newFail$failMsg$suffixMsg";
>+
>         $resultdata{result} = 'FAIL';
>         $resultdata{error} = $currentfailure;
>     } elsif ($scenario ne 'skip' && !$currentfailure) {
>@@ -891,9 +895,9 @@ Specify root test262 directory.
> 
> Specify JSC location. If not provided, script will attempt to look up JSC.
> 
>-=item B<--debug, -d>
>+=item B<--release>
> 
>-Use debug build of JSC. Can only use if --jsc <path> is not provided. Release build of JSC is used by default.
>+Use the Release build of JSC. Can only use if --jsc <path> is not provided. The Debug build of JSC is used by default.
> 
> =item B<--verbose, -v>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185562: 340218