Title: [250251] trunk/Tools
Revision
250251
Author
jbed...@apple.com
Date
2019-09-23 13:50:59 -0700 (Mon, 23 Sep 2019)

Log Message

results.webkit.org: Collapse results with the same version name (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=201779

Rubber-stamped by Aakash Jain.

* resultsdbpy/resultsdbpy/view/static/js/configuration.js:
(Configuration.prototype.compare): Correctly compare constructed version names.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (250250 => 250251)


--- trunk/Tools/ChangeLog	2019-09-23 20:42:14 UTC (rev 250250)
+++ trunk/Tools/ChangeLog	2019-09-23 20:50:59 UTC (rev 250251)
@@ -1,3 +1,13 @@
+2019-09-23  Jonathan Bedard  <jbed...@apple.com>
+
+        results.webkit.org: Collapse results with the same version name (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=201779
+
+        Rubber-stamped by Aakash Jain.
+
+        * resultsdbpy/resultsdbpy/view/static/js/configuration.js:
+        (Configuration.prototype.compare): Correctly compare constructed version names.
+
 2019-09-16  Jiewen Tan  <jiewen_...@apple.com>
 
         [WebAuthn] LocalAuthenticator tests are failing on internal bots

Modified: trunk/Tools/resultsdbpy/resultsdbpy/view/static/js/configuration.js (250250 => 250251)


--- trunk/Tools/resultsdbpy/resultsdbpy/view/static/js/configuration.js	2019-09-23 20:42:14 UTC (rev 250250)
+++ trunk/Tools/resultsdbpy/resultsdbpy/view/static/js/configuration.js	2019-09-23 20:50:59 UTC (rev 250251)
@@ -190,8 +190,12 @@
                     return;
 
                 if (this[key] !== null && configuration[key] !== null) {
-                    if (typeof this[key] === 'string')
-                        result = this[key].localeCompare(configuration[key]);
+                    if (typeof this[key] === 'string') {
+                        if (key === 'version_name' && this[key].startsWith(configuration[key]))
+                            result = 0;
+                        else
+                            result = this[key].localeCompare(configuration[key]);
+                    }
                     else if (typeof this[key] === 'number' || typeof this[key] === 'boolean')
                         result = this[key] - configuration[key];
                     else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to