Skip to content

Commit

Permalink
Bug 1072447 - Display the web platform tests in a group
Browse files Browse the repository at this point in the history
  • Loading branch information
Ed Morley committed Sep 27, 2014
1 parent 31bfc11 commit d725cae
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 5 deletions.
22 changes: 22 additions & 0 deletions tests/etl/test_buildbot.py
Expand Up @@ -859,6 +859,28 @@
'os': 'linux',
'os_platform': 'linux64',
'vm': True}}),
('Ubuntu VM 12.04 x64 mozilla-central opt test web-platform-tests-3',
{'build_type': 'opt',
'job_type': 'unittest',
'name': {'group_name': 'W3C Web Platform Tests',
'group_symbol': 'W',
'name': 'W3C Web Platform Tests',
'job_symbol': '3'},
'platform': {'arch': 'x86_64',
'os': 'linux',
'os_platform': 'linux64',
'vm': True}}),
('Rev5 MacOSX Mavericks 10.9 cedar debug test web-platform-tests-reftests',
{'build_type': 'debug',
'job_type': 'unittest',
'name': {'group_name': 'W3C Web Platform Tests',
'group_symbol': 'W',
'name': 'W3C Web Platform Reftests',
'job_symbol': 'Wr'},
'platform': {'arch': 'x86_64',
'os': 'mac',
'os_platform': 'osx-10-9',
'vm': False}}),
]


Expand Down
12 changes: 7 additions & 5 deletions treeherder/etl/buildbot.py
Expand Up @@ -528,6 +528,8 @@
"SpiderMonkey GGC Shell Build": "SpiderMonkey",
"SpiderMonkey Hazard Analysis Build": "SpiderMonkey",
"SpiderMonkey Root Analysis Build": "SpiderMonkey",
"W3C Web Platform Tests": "W3C Web Platform Tests",
"W3C Web Platform Reftests": "W3C Web Platform Tests",
"Talos Performance": "Talos Performance",
"Talos canvasmark": "Talos Performance",
"Talos chrome": "Talos Performance",
Expand Down Expand Up @@ -680,6 +682,8 @@
"Reftest OMTC": "Ro",
"Reftest Sanity": "Rs",
"Reftest Unaccelerated": "Ru",
"W3C Web Platform Tests": "W",
"W3C Web Platform Reftests": "Wr",

# All other unit tests, sorted alphabetically by symbol.
"CPP Unit Tests": "Cpp",
Expand All @@ -698,8 +702,6 @@
"Marionette WebAPI Tests": "Mnw",
"Android x86 Test Set": "S",
"Android x86 Test Combos": "Sets",
"W3C Web Platform Tests": "W",
"W3C Web Platform Reftests": "Wr",
"XPCShell": "X",
"Mozmill": "Z",

Expand Down Expand Up @@ -811,9 +813,9 @@ def get_symbol(name, bn):
nummatch = NUMBER_RE.match(bn)
n = nummatch.group(1) if nummatch else ""

# For multi-part Mochitest, Mochitest-e10s and Mochitest OOP jobs
# display only the job part number, and not the letters.
if n and s in ["M", "M-e10s", "M-oop"]:
# For multi-part Mochitest, Mochitest-e10s, Mochitest OOP & W3C Web Platform
# jobs, display only the job part number and not the letters.
if n and s in ["M", "M-e10s", "M-oop", "W"]:
return n

return "{0}{1}".format(s, n)
Expand Down

0 comments on commit d725cae

Please sign in to comment.