Changeset 232755 in webkit

Timestamp:

Jun 12, 2018 10:16:50 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

test262/Runner.pm: minor updates
​https://bugs.webkit.org/show_bug.cgi?id=186399

• If harness files cannot be found in a CLI supplied

test262 path, then default to webkit's test262 harness files.

• Lazily create the test262-results directory (only right before

writing to it)

• If an expectation file is supplied via the CLI, save to the

supplied location instead of the default webkit location
(JSTest/test262/expectation.yaml).

Patch by Valerie R Young <​valerie@bocoup.com> on 2018-06-12
Reviewed by Michael Saboff.

• Scripts/test262/Runner.pm:

(processCLI):
(main):
(compileTest):
(processResult):
(getHarness):
(summarizeResults):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (2 diffs)
• Scripts/test262/Runner.pm (modified) (14 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-06-12  Valerie R Young  <valerie@bocoup.com>
+
+        test262/Runner.pm: minor updates
+        https://bugs.webkit.org/show_bug.cgi?id=186399
+
+        - If harness files cannot be found in a CLI supplied
+        test262 path, then default to webkit's test262 harness files.
+        - Lazily create the test262-results directory (only right before
+        writing to it)
+       - If an expectation file is supplied via the CLI, save to the
+        supplied location instead of the default webkit location
+        (JSTest/test262/expectation.yaml).
+
+        Reviewed by Michael Saboff.
+
+        * Scripts/test262/Runner.pm:
+        (processCLI):
+        (main):
+        (compileTest):
+        (processResult):
+        (getHarness):
+        (summarizeResults):
+
 2018-06-11  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 
@@ -672 +695 @@
         (determineXcodeSDK): Always prefer .internal SDKs if available.
         * Scripts/webkitperl/webkitdirs_unittest/availableXcodeSDKS.pl:
-        
+
 2018-06-07  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/Scripts/test262/Runner.pm

@@ -79 +79 @@
 my $verbose;
 my $JSC;
-my $test262Dir;
 my $harnessDir;
 my %filterFeatures;
@@ -92 +91 @@
 my $timeout;
 
-my $expectationsFile = abs_path("$Bin/../../../JSTests/test262/expectations.yaml");
-my $configFile = abs_path("$Bin/../../../JSTests/test262/config.yaml");
+my $test262Dir;
+my $webkitTest262Dir = abs_path("$Bin/../../../JSTests/test262");
+my $expectationsFile = abs_path("$webkitTest262Dir/expectations.yaml");
+my $configFile = abs_path("$webkitTest262Dir/config.yaml");
 
 my $resultsDir = $ENV{PWD} . "/test262-results";
-mkpath($resultsDir);
-
-my $resultsFile = abs_path("$resultsDir/results.yaml");
-my $summaryTxtFile = abs_path("$resultsDir/summary.txt");
-my $summaryFile = abs_path("$resultsDir/summary.yaml");
+my $resultsFile;
+my $summaryTxtFile;
+my $summaryFile;
 
 my @results;
@@ -107 +106 @@
 my $tempdir = tempdir();
 my ($deffh, $deffile) = getTempFile();
-
-my @default_harnesses;
 
 my $startTime = time();
@@ -167 +164 @@
     }
 
-    if ($stats) {
-        if (! -e $resultsFile) {
-            die "Error: cannot find results file to summarize," .
+    if ($stats || $failingOnly) {
+        # If not supplied, try to find the results file in expected directory
+        $resultsFile ||= abs_path("$resultsDir/results.yaml");
+
+        if ($failingOnly && ! -e $resultsFile) {
+            die "Error: cannot find results file to run failing tests," .
                 "please specify with --results.";
         }
-        summarizeResults();
-        exit;
-    }
+
+        if ($stats) {
+            if (! -e $resultsFile) {
+                die "Error: cannot find results file to summarize," .
+                    " please specify with --results.";
+            }
+            summarizeResults();
+            exit;
+        }
+    }
+
 
     if ($JSC) {
@@ -196 +204 @@
 
     if (! $test262Dir) {
-        $test262Dir = abs_path("$Bin/../../../JSTests/test262");
+        $test262Dir = $webkitTest262Dir;
     } else {
         $test262Dir = abs_path($test262Dir);
     }
+
     $harnessDir = "$test262Dir/harness";
+    if (! -e $harnessDir) {
+        # if the harness directory does not exist in the custom test262 path,
+        # then use the webkits harness directory.
+        $harnessDir = "$webkitTest262Dir/harness";
+    }
+
 
     if (! $ignoreConfig) {
@@ -211 +226 @@
             %configSkipHash = map { $_ => 1 } @{$config->{skip}->{files}};
         }
-    }
-
-    if ( $failingOnly && ! -e $resultsFile ) {
-        die "Error: cannot find results file to run failing tests," .
-            " please specify with --results.";
     }
 
@@ -257 +267 @@
 }
 
+
 sub main {
     processCLI();
 
-    @default_harnesses = (
+    my @defaultHarnessFiles = (
         "$harnessDir/sta.js",
         "$harnessDir/assert.js",
@@ -266 +277 @@
         "$Bin/agent.js"
     );
-    print $deffh getHarness(<@default_harnesses>);
+
+    print $deffh getHarness(\@defaultHarnessFiles);
 
     # If not commandline test path supplied, use the root directory of all tests.
@@ -390 +402 @@
 
     if ($runningAllTests) {
+        if (! -e $resultsDir) {
+            mkpath($resultsDir);
+        }
+        $resultsFile = abs_path("$resultsDir/results.yaml");
+
         DumpFile($resultsFile, \@results);
         print "Saved all the results in $resultsFile\n";
@@ -593 +610 @@
     my ($tfh, $tfname) = getTempFile();
 
-    my $includesContent = getHarness(map { "$harnessDir/$_" } @{ $includes });
+    my @includes = map { "$harnessDir/$_" } @{ $includes };
+    my $includesContent = getHarness(\@includes);
     print $tfh $includesContent;
 
@@ -665 +683 @@
     if ($scenario ne 'skip' && $currentfailure) {
 
-        # We have a new failure if we have loaded an expectation file
-        # AND (there is no expected failure OR the failure has changed).
-        my $isnewfailure = $expect
-            && (!$expectedfailure || $expectedfailure ne $currentfailure);
+        # We have a new failure if we haven't loaded an expectation file
+        # (all fails are new) OR we have loaded an expectation fail and
+        # (there is no expected failure OR the failure has changed).
+        my $isnewfailure = ! $expect
+            || !$expectedfailure || $expectedfailure ne $currentfailure;
 
         # Print the failure if we haven't loaded an expectation file
@@ -748 +767 @@
 
 sub getHarness {
-    my @files = @_;
+    my ($filesref) = @_;
+
     my $content;
-    for (@files) {
+    for (@{$filesref}) {
         my $file = $_;
 
@@ -761 +781 @@
     };
 
-    return $content;
+    return $content || '';
 }
 
@@ -771 +791 @@
         @results = @{$rawresults[0]};
     }
+
+    # Create test262-results folder if it does not exits
+    if (! -e $resultsDir) {
+        mkpath($resultsDir);
+    }
+    $summaryTxtFile = abs_path("$resultsDir/summary.txt");
+    $summaryFile = abs_path("$resultsDir/summary.yaml");
+
     my %byfeature;
     my %bypath;