Merging from default\n

changeset: 1595:68f3606bd6a9 parent: 1593:77e1896a4700 user: Lukas Blakk <lsblakk@mozilla.com> date: Wed Jun 08 11:17:10 2011 +0200 summary: Bug 649402 - make try mandatory, removes the -a 'do everything' option p=lsblakk r=rail changeset: 1596:89bda47f09ef tag: tip user: Mike Taylor <bear@mozilla.com> date: Wed Jun 08 11:02:30 2011 -0400 summary: bug 643607 r=bear bustage fix: put the browser-chrome checks back into the non-remote steps --HG-- branch : production-0.8
mozilla-releng · Jun 8, 2011 · 675f980 · 675f980
2 parents 3e48f2f + e75cbda
commit 675f980
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/steps/unittest.py b/steps/unittest.py
@@ -120,6 +120,9 @@ def summarizeLog(name, log, successIdent, failureIdent, otherIdent, infoRe):
 
 def summarizeLogMochitest(name, log):
     infoRe = r"\d+ INFO (Passed|Failed|Todo):\ +(\d+)"
+    # Support browser-chrome result summary format which differs from MozillaMochitest's.
+    if name == 'mochitest-browser-chrome':
+        infoRe = r"\t(Passed|Failed|Todo): (\d+)"
 
     return summarizeLog(
         name, log, "Passed", "Failed", "Todo",
@@ -266,8 +269,10 @@ def evaluateRemoteMochitest(name, log, superResult):
     if superResult != SUCCESS:
         return superResult
 
-    failIdent = r"^\tFailed: 0"
+    failIdent = r"^\d+ INFO Failed: 0"
-
+    # Support browser-chrome result summary format which differs from MozillaMochitest's.
+    if 'browser-chrome' in name:
+        failIdent = r"^\tFailed: 0"
     # Assume that having the 'failIdent' line
     # means the tests run completed (successfully).
     # Also check for "^TEST-UNEXPECTED-" for harness errors.

diff --git a/try_parser.py b/try_parser.py
@@ -109,10 +109,6 @@ def TryParser(message, builderNames, prettyNames, unittestPrettyNames=None, unit
                                      and tryParse populates the list with the builderNames\
                                      that need schedulers.')
 
-    parser.add_argument('--do-everything', '-a',
-                        action='store_true',
-                        dest='do_everything',
-                        help='m-c override to do all builds, tests, talos just like a trunk push')
     parser.add_argument('--build', '-b',
                         default='do',
                         dest='build',
@@ -132,12 +128,6 @@ def TryParser(message, builderNames, prettyNames, unittestPrettyNames=None, unit
 
     (options, unknown_args) = parser.parse_known_args(processMessage(message))
 
-    if options.do_everything:
-        options.build = ['opt', 'debug']
-        options.user_platforms = 'all'
-        options.test = 'all'
-        options.talos = 'all'
-
     # Build options include a possible override of 'all' to get a buildset that matches m-c
     if options.build == 'do' or options.build == 'od':
         options.build = ['opt', 'debug']