Modified: trunk/Tools/ChangeLog (231721 => 231722)
--- trunk/Tools/ChangeLog 2018-05-11 22:03:06 UTC (rev 231721)
+++ trunk/Tools/ChangeLog 2018-05-11 22:19:03 UTC (rev 231722)
@@ -1,3 +1,24 @@
+2018-05-11 Leo Balter <[email protected]>
+
+ Test262 Runner should search for the Debug JSC by default
+ https://bugs.webkit.org/show_bug.cgi?id=185562
+
+ Reviewed by Michael Saboff.
+
+ 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 <[email protected]>
Runtime feature flag for Server-Timing
Modified: trunk/Tools/Scripts/test262/Runner.pm (231721 => 231722)
--- trunk/Tools/Scripts/test262/Runner.pm 2018-05-11 22:03:06 UTC (rev 231721)
+++ trunk/Tools/Scripts/test262/Runner.pm 2018-05-11 22:19:03 UTC (rev 231722)
@@ -107,7 +107,7 @@
sub processCLI {
my $help = 0;
- my $debug;
+ my $release;
my $ignoreExpectations;
my @features;
my $stats;
@@ -122,7 +122,7 @@
'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 @@
$DYLD_FRAMEWORK_PATH = dirname($JSC);
}
} else {
- $JSC = getBuildPath($debug);
+ $JSC = getBuildPath($release);
}
if ($latestImport) {
@@ -278,7 +278,6 @@
}
}
-
# If we are processing many files, fork process
if (scalar @files > $max_process * 5) {
@@ -457,7 +456,7 @@
}
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 @@
die 'Error: cannot find webkit-build-directory, specify with JSC with --jsc <path>.';
}
- if ($debug) {
+ if ($release) {
+ $cmd .= ' --release';
+ } else {
$cmd .= ' --debug';
- } else {
- $cmd .= ' --release';
}
$cmd .= ' --executablePath';
my $jscDir = qx($cmd);
chomp $jscDir;
-
my $jsc;
$jsc = $jscDir . '/jsc';
@@ -653,17 +651,23 @@
# 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 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>
