Some fixes for Swarming bots

infra/bots/flavor/default_flavor.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Default flavor utils class, used for desktop bots."""
 
@@ skipping 57 matching lines @@
   'step' function, so that commands may be run through ADB.
   """
   def __init__(self, bot_info, *args, **kwargs):
     self._bot_info = bot_info
     self.chrome_path = os.path.join(self._bot_info.build_dir, 'src')
 
   def run(self, cmd, **kwargs):
     """Runs a step as appropriate for this flavor."""
     path_to_app = os.path.join(self._bot_info.out_dir,
                                self._bot_info.configuration, cmd[0])
-    if (sys.platform == 'linux' and
+    if ('linux' in sys.platform and
         'x86_64' in self._bot_info.bot_name and
         not 'TSAN' in self._bot_info.bot_name):
       new_cmd = ['catchsegv', path_to_app]
     else:
+      if sys.platform == 'win32':
+        path_to_app += '.exe'
       new_cmd = [path_to_app]
     new_cmd.extend(cmd[1:])
     return self._bot_info.run(new_cmd, **kwargs)
 
   def bootstrap_win_toolchain(self):
     """Run bootstrapping script for the Windows toolchain."""
     bootstrap_script = os.path.join(self._bot_info.infrabots_dir,
                                     'bootstrap_win_toolchain_json.py')
     win_toolchain_json = os.path.join(
         self._bot_info.build_dir, 'src', 'build', 'win_toolchain.json')
@@ skipping 83 matching lines @@
     return DeviceDirs(
         dm_dir=os.path.join(self._bot_info.swarm_out_dir, 'dm'),
         perf_data_dir=self._bot_info.perf_data_dir,
         resource_dir=self._bot_info.resource_dir,
         images_dir=join('images'),
         skp_dir=self._bot_info.local_skp_dir,
         tmp_dir=join('tmp'))
 
   def __repr__(self):
     return '<%s object>' % self.__class__.__name__  # pragma: no cover