Bug 1332844: alias "Ubuntu" to test platform linux32, rather than linux; r?gbrown
MozReview-Commit-ID: GjY9tF5TxjL
--- a/taskcluster/taskgraph/test/test_try_option_syntax.py
+++ b/taskcluster/taskgraph/test/test_try_option_syntax.py
@@ -199,31 +199,31 @@ class TestTryOptionSyntax(unittest.TestC
self.assertEqual(sorted(tos.unittests), sorted([
{'test': 'gtest', 'platforms': ['linux', 'win32']},
]))
def test_u_platforms_pretty(self):
"-u gtest[Ubuntu] selects the linux, linux64 and linux64-asan platforms for gtest"
tos = TryOptionSyntax('try: -u gtest[Ubuntu]', graph_with_jobs)
self.assertEqual(sorted(tos.unittests), sorted([
- {'test': 'gtest', 'platforms': ['linux', 'linux64', 'linux64-asan']},
+ {'test': 'gtest', 'platforms': ['linux32', 'linux64', 'linux64-asan']},
]))
def test_u_platforms_negated(self):
"-u gtest[-linux] selects all platforms but linux for gtest"
tos = TryOptionSyntax('try: -u gtest[-linux]', graph_with_jobs)
self.assertEqual(sorted(tos.unittests), sorted([
{'test': 'gtest', 'platforms': ['linux64']},
]))
def test_u_platforms_negated_pretty(self):
"-u gtest[Ubuntu,-x64] selects just linux for gtest"
tos = TryOptionSyntax('try: -u gtest[Ubuntu,-x64]', graph_with_jobs)
self.assertEqual(sorted(tos.unittests), sorted([
- {'test': 'gtest', 'platforms': ['linux']},
+ {'test': 'gtest', 'platforms': ['linux32']},
]))
def test_u_chunks_platforms(self):
"-u gtest-1[linux,win32] selects the linux and win32 platforms for chunk 1 of gtest"
tos = TryOptionSyntax('try: -u gtest-1[linux,win32]', graph_with_jobs)
self.assertEqual(sorted(tos.unittests), sorted([
{'test': 'gtest', 'platforms': ['linux', 'win32'], 'only_chunks': set('1')},
]))
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -119,17 +119,17 @@ UNITTEST_ALIASES = {
}
# unittest platforms can be specified by substring of the "pretty name", which
# is basically the old Buildbot builder name. This dict has {pretty name,
# [test_platforms]} translations, This includes only the most commonly-used
# substrings. This is intended only for backward-compatibility. New test
# platforms should have their `test_platform` spelled out fully in try syntax.
UNITTEST_PLATFORM_PRETTY_NAMES = {
- 'Ubuntu': ['linux', 'linux64', 'linux64-asan'],
+ 'Ubuntu': ['linux32', 'linux64', 'linux64-asan'],
'x64': ['linux64', 'linux64-asan'],
'Android 4.3': ['android-4.3-arm7-api-15'],
# other commonly-used substrings for platforms not yet supported with
# in-tree taskgraphs:
# '10.10': [..TODO..],
# '10.10.5': [..TODO..],
# '10.6': [..TODO..],
# '10.8': [..TODO..],