Update Dr. Memory bot factories to fully handle a 3rd platform, MacOS.

scripts/master/factory/drmemory_factory.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import ntpath
 import posixpath
 import re
 from buildbot.process import factory
 from buildbot.process.properties import WithProperties
 from buildbot.steps.source import SVN
@@ skipping 29 matching lines @@
   'media_unittests',
   'net_unittests',
   'printing_unittests',
   'remoting_unittests',
   'sql_unittests',
   'unit_tests',
   'url_unittests',
 ]
 
 
-def WindowsToOs(windows):
-  """Takes a boolean windows value and returns a platform string."""
-  if windows:
+def BotToPlatform(bot_platform):
+  """Takes a bot platform value and returns a platform string."""
+  if bot_platform.startswith('win'):
     return 'windows'
+  elif bot_platform.startswith('linux'):
+    return 'linux'
+  elif bot_platform.startswith('mac'):
+    return 'mac'
   else:
-    return 'linux'
+    raise ValueError('Unknown platform %s' % platform)
 
 
 def OsFullName(platform):
   if platform.startswith('win'):
     return 'Windows'
   elif platform.startswith('linux'):
     return 'Linux'
   else:
     raise ValueError('Unknown platform %s' % platform)
 
 
 def OsShortName(platform):
   if platform.startswith('win'):
     return 'win'
   elif platform.startswith('linux'):
     return 'linux'
+  elif platform.startswith('mac'):
+    return 'mac'
   else:
     raise ValueError('Unknown platform %s' % platform)
 
 
 def ArchToBits(arch):
   """Takes an arch string like x64 and ia32 and returns its bitwidth."""
   if not arch:  # Default to x64.
     return 64
   elif arch == 'x64':
     return 64
@@ skipping 16 matching lines @@
     self.factory = build_factory
     self.target_platform = OsShortName(target_platform)
     self.os_version = os_version
 
   def IsWindows(self):
     """Returns true if we're targetting Windows."""
     return self.target_platform.startswith('win')
 
   def IsMac(self):
     """Returns true if we're targetting Mac OSX."""
-    return self.target_platform.startswith('darwin')
+    return self.target_platform.startswith('mac')
 
   def PathJoin(self, *args):
     """Join paths using the separator of the os of the bot."""
     if self.IsWindows():
       return ntpath.normpath(ntpath.join(*args))
     else:
       return posixpath.normpath(posixpath.join(*args))
 
   def AddStep(self, step_class, **kwargs):
     """Adds a regular buildbot step."""
@@ skipping 493 matching lines @@
 
 
 def DynamoRIONightlyFactory(os='', os_version=''):
   return DrCommands(os, os_version).DynamoRIONightly()
 
 
 def DynamoRIOPackageFactory(os='', os_version=''):
   return DrCommands(os, os_version).DynamoRIOPackage()
 
 
-def CreateDrMFactory(windows):
+def CreateDrMFactory(bot_platform):
   # Build and run the drmemory pre-commit suite.
-  cmds = DrCommands(WindowsToOs(windows))
+  cmds = DrCommands(BotToPlatform(bot_platform))
   cmds.DrMemorySuite()
   if cmds.IsWindows():
     cmds.AddTSanTestBuild()
     cmds.AddDrMemoryTSanTests()
     # We used to kill stale drmemory processes, but now we use auto-reboot.
   cmds.AddDrMemoryLogsUpload()
   return cmds.factory
 
 
-def CreateDrMPackageFactory(windows):
-  return DrCommands(WindowsToOs(windows)).DrMemoryPackage()
+def CreateDrMPackageFactory(bot_platform):
+  return DrCommands(BotToPlatform(bot_platform)).DrMemoryPackage()
 
 
 def CreateWinChromeFactory(builder):
   """Run chrome tests with the latest drmemory.
 
   Do *not* build TOT chrome or sync it.  Building chrome takes a lot of
   resources and the tests are flaky, so we only do at known good revisions.  We
   don't want to fall too far behind, or we're not really testing Chrome's full
   test suite.
   """
@@ skipping 125 matching lines @@
     # TODO(rnk): We should run some selection of layout tests if we want to
     # verify output.
     ret.addStep(Test(command=cmd,
                      env={'CHROME_DEVEL_SANDBOX':
                           '/opt/chromium/chrome_sandbox'},
                      name=test,
                      descriptionDone=test,
                      description=test))
 
   return ret