Changeset 214372 in webkit

Timestamp:

Mar 24, 2017 1:51:22 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Add JSON results for API tests
​https://bugs.webkit.org/show_bug.cgi?id=170021

Patch by Srinivasan Vijayaraghavan <​svijayaraghavan@apple.com> on 2017-03-24
Reviewed by Alexey Proskuryakov.

• Scripts/run-api-tests:

(runTestsBySuite): Appends failures and timeouts to JSON data.
(writeJsonDataIfApplicable): Writes JSON data to a file.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-api-tests (modified) (8 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-03-24  Srinivasan Vijayaraghavan  <svijayaraghavan@apple.com>
+
+        Add JSON results for API tests
+        https://bugs.webkit.org/show_bug.cgi?id=170021
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/run-api-tests:
+        (runTestsBySuite): Appends failures and timeouts to JSON data.
+        (writeJsonDataIfApplicable): Writes JSON data to a file.
+
 2017-03-24  Lucas Forschler  <lforschler@apple.com>
 

trunk/Tools/Scripts/run-api-tests

@@ -28 +28 @@
 
 use File::Basename;
+use File::Spec;
 use FindBin;
 use Getopt::Long qw(:config pass_through);
 use IPC::Open3;
+use JSON::PP;
 use lib $FindBin::Bin;
 use sigtrap qw(die normal-signals);
@@ -44 +46 @@
 sub archCommandLineArgumentsForRestrictedEnvironmentVariables();
 sub testToolPaths();
+sub writeJSONDataIfApplicable();
 
 # Defined in VCSUtils.
@@ -63 +66 @@
 my $wtfOnly = 0;
 my %testToToolMap;
+my %jsonData = ();
+my $jsonFileName;
 
 
@@ -72 +77 @@
   -d|--dump-tests       Dump the names of testcases without running them
   --[no-]build          Build (or do not build) unit tests prior to running (default: $buildDefault)
+  --json-output=        Create a file at the specified path, listing test failures and timeouts in JSON format.
   --root=               Path to the pre-built root containing TestWebKitAPI
   --show-leaks          Show leaks in the output
@@ -98 +104 @@
     'show-leaks' => \$showLeaks,
     'no-timeout' => \$disableTimeout,
+    'json-output=s' => \$jsonFileName,
     'dump|d' => \$dumpTests,
     'build!' => \$build,
@@ -112 +119 @@
 
 setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
+
+if (defined($jsonFileName)) {
+    $jsonFileName = File::Spec->rel2abs($jsonFileName);
+}
 
 buildTestTool() if $build && !defined($root);
@@ -176 +187 @@
         }
     }
+
+    if (defined($jsonFileName)) {
+        $jsonData{'failures'} = \@testsFailed;
+        $jsonData{'timeouts'} = \@testsTimedOut;
+    }
+
+    writeJSONDataIfApplicable();
 
     return @testsFailed > 0 || @testsTimedOut > 0;
@@ -414 +432 @@
     return ("$pathWTF$suffix.exe", "$pathWebCore$suffix.exe", "$pathWebKit$suffix.exe");
 }
+
+sub writeJSONDataIfApplicable()
+{
+    if (defined($jsonFileName)) {
+        open(my $fileHandler, ">", $jsonFileName) or die;
+        print $fileHandler "${\encode_json(\%jsonData)}\n";
+        close($fileHandler);
+    }
+}