Bug 1230596 - Allow running talos on specific platforms through mach try. r=jgraham
authorChris Manchester <cmanchester@mozilla.com>
Mon, 07 Dec 2015 15:13:03 -0800
changeset 311840 c0c2e2df018067a165ff5de407e48acdae35e7b8
parent 311839 8d8cd6abab67245413e684769b8bc4321a4e2300
child 311841 bb137598c5821b8c28ffc0a8bc4ecac4420dfee9
push id1040
push userraliiev@mozilla.com
push dateMon, 29 Feb 2016 17:11:22 +0000
treeherdermozilla-release@8c3167321162 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham
bugs1230596
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1230596 - Allow running talos on specific platforms through mach try. r=jgraham
testing/mach_commands.py
testing/tools/autotry/autotry.py
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -519,17 +519,18 @@ class PushToTry(MachCommandBase):
         try:
             tests = (self.normalise_list(kwargs["tests"], allow_subitems=True)
                      if kwargs["tests"] else {})
         except ValueError as e:
             print("Error parsing -u argument (%s):\n%s" % (kwargs["tests"], e.message))
             sys.exit(1)
 
         try:
-            talos = self.normalise_list(kwargs["talos"]) if kwargs["talos"] else []
+            talos = (self.normalise_list(kwargs["talos"], allow_subitems=True)
+                     if kwargs["talos"] else [])
         except ValueError as e:
             print("Error parsing -t argument:\n%s" % e.message)
             sys.exit(1)
 
         paths = []
         for p in kwargs["paths"]:
             p = os.path.normpath(os.path.abspath(p))
             if not p.startswith(self.topsrcdir):
--- a/testing/tools/autotry/autotry.py
+++ b/testing/tools/autotry/autotry.py
@@ -315,17 +315,18 @@ class AutoTry(object):
         if not suites:
             raise ValueError("No tests found matching filters")
 
         parts.append("-u")
         parts.append(",".join("%s%s" % (k, "[%s]" % ",".join(v) if v else "")
                               for k,v in sorted(suites.items())) if suites else "none")
 
         parts.append("-t")
-        parts.append(",".join(talos) if talos else "none")
+        parts.append(",".join("%s%s" % (k, "[%s]" % ",".join(v) if v else "")
+                              for k,v in sorted(talos.items())) if talos else "none")
 
         if tags:
             parts.append(' '.join('--tag %s' % t for t in tags))
 
         if extra_args is not None:
             parts.extend(extra_args)
 
         if paths: