From 2a6986b8577fc9326018e325fbbf39d5ad90d5e8 Mon Sep 17 00:00:00 2001
From: Samson <16504129+sagudev@users.noreply.github.com>
Date: Thu, 12 Dec 2024 10:00:48 +0100
Subject: Run bencher in try-full (#34556)

* Run bencher in try-full

Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>

* Fix naming

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
---
 python/servo/try_parser.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'python/servo/try_parser.py')

diff --git a/python/servo/try_parser.py b/python/servo/try_parser.py
index a50d890af43..de00bf5fe0a 100644
--- a/python/servo/try_parser.py
+++ b/python/servo/try_parser.py
@@ -72,10 +72,15 @@ class JobConfig(object):
 
         self.wpt_layout |= other.wpt_layout
         self.unit_tests |= other.unit_tests
-        # to join "Linux" and "Linux WPT" into "Linux WPT"
-        if len(other.name) > len(self.name):
-            self.name = other.name
         self.bencher |= other.bencher
+        common = min([self.name, other.name], key=len)
+        p1 = self.name.strip(common).strip()
+        p2 = other.name.strip(common).strip()
+        self.name = common.strip()
+        if p1:
+            self.name += f" {p1}"
+        if p2:
+            self.name += f" {p2}"
         return True
 
 
@@ -146,7 +151,7 @@ class Config(object):
                 self.fail_fast = True
                 continue  # skip over keyword
             if word == "full":
-                words.extend(["linux", "linux-wpt", "macos", "windows", "android", "ohos", "lint"])
+                words.extend(["linux", "linux-wpt", "linux-perf", "macos", "windows", "android", "ohos", "lint"])
                 continue  # skip over keyword
 
             job = handle_preset(word)
@@ -193,57 +198,57 @@ class TestParser(unittest.TestCase):
         self.assertDictEqual(json.loads(Config("").to_json()),
                              {"fail_fast": False, "matrix": [
                               {
-                                  'bencher': False,
-                                  "name": "Linux WPT",
+                                  "name": "Linux WPT perf",
                                   "workflow": "linux",
                                   "wpt_layout": "2020",
                                   "profile": "release",
                                   "unit_tests": True,
+                                  'bencher': True,
                                   "wpt_args": ""
                               },
                               {
-                                  'bencher': False,
                                   "name": "MacOS",
                                   "workflow": "macos",
                                   "wpt_layout": "none",
                                   "profile": "release",
                                   "unit_tests": True,
+                                  'bencher': False,
                                   "wpt_args": ""
                               },
                               {
-                                  'bencher': False,
                                   "name": "Windows",
                                   "workflow": "windows",
                                   "wpt_layout": "none",
                                   "profile": "release",
                                   "unit_tests": True,
+                                  'bencher': False,
                                   "wpt_args": ""
                               },
                               {
-                                  'bencher': False,
                                   "name": "Android",
                                   "workflow": "android",
                                   "wpt_layout": "none",
                                   "profile": "release",
                                   "unit_tests": False,
+                                  'bencher': False,
                                   "wpt_args": ""
                               },
                               {
-                                  'bencher': False,
                                   "name": "OpenHarmony",
                                   "workflow": "ohos",
                                   "wpt_layout": "none",
                                   "profile": "release",
                                   "unit_tests": False,
+                                  'bencher': False,
                                   "wpt_args": ""
                               },
                               {
-                                  'bencher': False,
                                   "name": "Lint",
                                   "workflow": "lint",
                                   "wpt_layout": "none",
                                   "profile": "release",
                                   "unit_tests": False,
+                                  'bencher': False,
                                   "wpt_args": ""}
                               ]})
 
-- 
cgit v1.2.3