Title: [252791] trunk/Tools
Revision
252791
Author
jbed...@apple.com
Date
2019-11-22 12:06:19 -0800 (Fri, 22 Nov 2019)

Log Message

run-_javascript_core-tests: Failure to determine configuration for reporting is fatal
https://bugs.webkit.org/show_bug.cgi?id=204526

Reviewed by Aakash Jain.

* Scripts/run-_javascript_core-tests:
(configurationForUpload): Return empty hash if no configuration is available.
(uploadResults): Soft-fail upload if configuration is empty.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (252790 => 252791)


--- trunk/Tools/ChangeLog	2019-11-22 20:01:29 UTC (rev 252790)
+++ trunk/Tools/ChangeLog	2019-11-22 20:06:19 UTC (rev 252791)
@@ -1,3 +1,14 @@
+2019-11-22  Jonathan Bedard  <jbed...@apple.com>
+
+        run-_javascript_core-tests: Failure to determine configuration for reporting is fatal
+        https://bugs.webkit.org/show_bug.cgi?id=204526
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/run-_javascript_core-tests:
+        (configurationForUpload): Return empty hash if no configuration is available.
+        (uploadResults): Soft-fail upload if configuration is empty.
+
 2019-11-22  Aakash Jain  <aakash_j...@apple.com>
 
         Setup EWS queue for JSConly i386

Modified: trunk/Tools/Scripts/run-_javascript_core-tests (252790 => 252791)


--- trunk/Tools/Scripts/run-_javascript_core-tests	2019-11-22 20:01:29 UTC (rev 252790)
+++ trunk/Tools/Scripts/run-_javascript_core-tests	2019-11-22 20:06:19 UTC (rev 252791)
@@ -420,7 +420,8 @@
             }
         }
     } else {
-        die "Cannot determine platform\n";
+        print "Cannot determine platform\n";
+        return {};
     }
 
     my $result = {
@@ -459,7 +460,6 @@
 }
 
 setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
-configurationForUpload() if (defined($report));
 
 if (defined($jsonFileName)) {
     $jsonFileName = File::Spec->rel2abs($jsonFileName);
@@ -876,6 +876,12 @@
         return 0;
     }
 
+    my $configuration = configurationForUpload();
+    if (!keys $configuration) {
+        print "Invalid configuration, failed to upload to $report\n";
+        return 1;
+    }
+
     my %upload = (
         version => 0,
         suite => '_javascript_core-tests',
@@ -885,7 +891,7 @@
             repository_id => 'webkit',
             id => determineCurrentSVNRevision(),
         }],
-        configuration => configurationForUpload(),
+        configuration => $configuration,
         test_results => {
             run_stats => {
                 start_time => $startTime,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to