Title: [256920] trunk/Tools
Revision
256920
Author
jbed...@apple.com
Date
2020-02-19 08:37:35 -0800 (Wed, 19 Feb 2020)

Log Message

results.webkit.org: Correctly report JSC tests for windows
https://bugs.webkit.org/show_bug.cgi?id=207910

Rubber-stamped by Aakash Jain.

* Scripts/run-_javascript_core-tests:
(configurationForUpload): Give Windows a version name.
* Scripts/webkitdirs.pm:
(determineWinVersion): Correctly parse Windows 10 version numbers, conform to
Version dictionary.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (256919 => 256920)


--- trunk/Tools/ChangeLog	2020-02-19 16:33:03 UTC (rev 256919)
+++ trunk/Tools/ChangeLog	2020-02-19 16:37:35 UTC (rev 256920)
@@ -1,3 +1,16 @@
+2020-02-19  Jonathan Bedard  <jbed...@apple.com>
+
+        results.webkit.org: Correctly report JSC tests for windows
+        https://bugs.webkit.org/show_bug.cgi?id=207910
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/run-_javascript_core-tests:
+        (configurationForUpload): Give Windows a version name.
+        * Scripts/webkitdirs.pm:
+        (determineWinVersion): Correctly parse Windows 10 version numbers, conform to
+        Version dictionary.
+
 2020-02-19  Chris Dumez  <cdu...@apple.com>
 
         Unreviewed, fix assertions in storage access API layout tests after r256882.

Modified: trunk/Tools/Scripts/run-_javascript_core-tests (256919 => 256920)


--- trunk/Tools/Scripts/run-_javascript_core-tests	2020-02-19 16:33:03 UTC (rev 256919)
+++ trunk/Tools/Scripts/run-_javascript_core-tests	2020-02-19 16:37:35 UTC (rev 256920)
@@ -403,6 +403,7 @@
         $platform = 'win';
         if (!$version) {
             $version = winVersion();
+            $versionName = "Win$version->{subminor}";
         }
     } elsif (isAppleMacWebKit()) {
         $platform = 'mac';

Modified: trunk/Tools/Scripts/webkitdirs.pm (256919 => 256920)


--- trunk/Tools/Scripts/webkitdirs.pm	2020-02-19 16:33:03 UTC (rev 256919)
+++ trunk/Tools/Scripts/webkitdirs.pm	2020-02-19 16:37:35 UTC (rev 256920)
@@ -1369,12 +1369,12 @@
     }
 
     my $versionString = `cmd /c ver`;
-    $versionString =~ /(\d)\.(\d)\.(\d+)/;
+    $versionString =~ /(\d+)\.(\d+)\.(\d+)/;
 
     $winVersion = {
         major => $1,
         minor => $2,
-        build => $3,
+        subminor => $3,
     };
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to