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

scripts/master/factory/drmemory_factory.py

Index: scripts/master/factory/drmemory_factory.py
===================================================================
--- scripts/master/factory/drmemory_factory.py	(revision 293033)
+++ scripts/master/factory/drmemory_factory.py	(working copy)
@@ -47,12 +47,16 @@
 ]
 
 
-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):
@@ -69,6 +73,8 @@
     return 'win'
   elif platform.startswith('linux'):
     return 'linux'
+  elif platform.startswith('mac'):
+    return 'mac'
   else:
     raise ValueError('Unknown platform %s' % platform)
 
@@ -105,7 +111,7 @@
 
   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."""
@@ -619,9 +625,9 @@
   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()
@@ -631,8 +637,8 @@
   return cmds.factory
 
 
-def CreateDrMPackageFactory(windows):
-  return DrCommands(WindowsToOs(windows)).DrMemoryPackage()
+def CreateDrMPackageFactory(bot_platform):
+  return DrCommands(BotToPlatform(bot_platform)).DrMemoryPackage()
 
 
 def CreateWinChromeFactory(builder):