Support OS X in coverity.py. Avoid echoing coverity password to console.

tools/coverity/coverity.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """
 Runs Coverity Prevent on a build of Chromium.
 
 This script should be run in a Visual Studio Command Prompt, so that the
 INCLUDE, LIB, and PATH environment variables are set properly for Visual
@@ skipping 66 matching lines @@
 # Relative to CHROMIUM_SOURCE_DIR.  Contains the pid of this script.
 LOCK_FILE = 'coverity.lock'
 
 def _ReadPassword(pwfilename):
   """Reads the coverity password in from a file where it was stashed"""
   pwfile = open(pwfilename, 'r')
   password = pwfile.readline()
   pwfile.close()
   return password.rstrip()
 
-def _RunCommand(cmd, dry_run, shell=False):
+def _RunCommand(cmd, dry_run, shell=False, echo_cmd=True):
   """Runs the command if dry_run is false, otherwise just prints the command."""
-  print cmd
+  if echo_cmd:
+    print cmd
   # TODO(wtc): Check the return value of subprocess.call, which is the return
   # value of the command.
   if not dry_run:
     subprocess.call(cmd, shell=shell)
 
 def _ReleaseLock(lock_file, lock_filename):
   """Removes the lockfile. Function-ized so we can bail from anywhere"""
   os.close(lock_file)
   os.remove(lock_filename)
 
@@ skipping 27 matching lines @@
   cmd = 'gclient sync'
   _RunCommand(cmd, options.dry_run, shell=True)
   print 'Elapsed time: %ds' % (time.time() - start_time)
 
   # Do a clean build.  Remove the build output directory first.
   if sys.platform == 'linux2':
     rm_path = os.path.join(options.source_dir,'src','out',options.target)
   elif sys.platform == 'win32':
     rm_path = os.path.join(options.source_dir,options.solution_dir,
                            options.target)
+  elif sys.platform == 'darwin':
+    rm_path = os.path.join(options.source_dir,'src','xcodebuild')
   else:
     print 'Platform "%s" unrecognized, don\'t know how to proceed'
     _ReleaseLock(lock_file, lock_filename)
     sys.exit(1)
 
   if options.dry_run:
     print 'shutil.rmtree(%s)' % repr(rm_path)
   else:
     shutil.rmtree(rm_path,True)
 
   print 'Elapsed time: %ds' % (time.time() - start_time)
 
   use_shell_during_make = False
   if sys.platform == 'linux2':
     use_shell_during_make = True
     os.chdir('src')
     _RunCommand('pwd', options.dry_run, shell=True)
     cmd = '%s/cov-build --dir %s make BUILDTYPE=%s' % (
       options.coverity_bin_dir, options.coverity_intermediate_dir,
       options.target)
   elif sys.platform == 'win32':
     cmd = '%s\\cov-build.exe --dir %s devenv.com %s\\%s /build %s' % (
       options.coverity_bin_dir, options.coverity_intermediate_dir,
       options.source_dir, options.solution_file, options.target)
+  elif sys.platform == 'darwin':
+    use_shell_during_make = True
+    os.chdir('src/build')
+    _RunCommand('pwd', options.dry_run, shell=True)
+    cmd = ('%s/cov-build --dir %s xcodebuild -project all.xcodeproj '
+           '-configuration %s -target All') % (
+      options.coverity_bin_dir, options.coverity_intermediate_dir,
+      options.target)
+
 
   _RunCommand(cmd, options.dry_run, shell=use_shell_during_make)
   print 'Elapsed time: %ds' % (time.time() - start_time)
 
   cov_analyze_exe = os.path.join(options.coverity_bin_dir,'cov-analyze')
   cmd = '%s --dir %s %s' % (cov_analyze_exe,
                             options.coverity_intermediate_dir,
                             options.coverity_analyze_options)
   _RunCommand(cmd, options.dry_run, shell=use_shell_during_make)
   print 'Elapsed time: %ds' % (time.time() - start_time)
@@ skipping 14 matching lines @@
          '--target %s '
          '--user %s '
          '--password %s') % (cov_commit_exe,
                              options.coverity_intermediate_dir,
                              options.coverity_dbhost,
                              options.coverity_port,
                              options.coverity_product,
                              coverity_target,
                              options.coverity_user,
                              coverity_password)
-  _RunCommand(cmd, options.dry_run, shell=use_shell_during_make)
+  # Avoid echoing the Commit command because it has a password in it

[wtc, 2010/06/15 22:04:07]

Can we tell cov-commit-defects to read the password from a
file?  That'll also solve the command echoing problem.

+  _RunCommand(cmd, options.dry_run, shell=use_shell_during_make, echo_cmd=False)
 
   print 'Total time: %ds' % (time.time() - start_time)
 
   _ReleaseLock(lock_file, lock_filename)
 
   return 0
 
 if '__main__' == __name__:
   option_parser = optparse.OptionParser()
   option_parser.add_option('', '--dry-run', action='store_true', default=False,
@@ skipping 51 matching lines @@
 
   option_parser.add_option('', '--coverity-password-file',
                            dest='coverity_password_file',
                            help='file containing the coverity password',
                            default='coverity-password')
 
   options, args = option_parser.parse_args()
 
   result = main(options, args)
   sys.exit(result)