Fix python scripts in src/tools/

tools/coverity/coverity.py

-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2011 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
 Studio.
@@ skipping 58 matching lines @@
 COVERITY_PRODUCT = 'Chromium'
 
 COVERITY_TARGET = 'Windows'
 
 COVERITY_USER = 'admin'
 # looking for a PASSWORD constant? Look at --coverity-password-file instead.
 
 # 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, echo_cmd=True):
   """Runs the command if dry_run is false, otherwise just prints the command."""
   if echo_cmd:
     print cmd
   if not dry_run:
     return subprocess.call(cmd, shell=shell)
   else:
     return 0
 
+
 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)
 
-def main(options, args):
+
+def run_coverity(options, args):
   """Runs all the selected tests for the given build type and target."""
   # Create the lock file to prevent another instance of this script from
   # running.
   lock_filename = os.path.join(options.source_dir, LOCK_FILE)
   try:
     lock_file = os.open(lock_filename,
                         os.O_CREAT | os.O_EXCL | os.O_TRUNC | os.O_RDWR)
   except OSError, err:
     print 'Failed to open lock file:\n  ' + str(err)
     return 1
@@ skipping 11 matching lines @@
   # The coverity-password filename may have been a relative path.
   # If so, assume it's relative to the source directory, which means
   # the time to read the password is after we do the chdir().
   coverity_password = _ReadPassword(options.coverity_password_file)
 
   cmd = 'gclient sync'
   gclient_exit = _RunCommand(cmd, options.dry_run, shell=True)
   if gclient_exit != 0:
     print 'gclient aborted with status %s' % gclient_exit
     _ReleaseLock(lock_file, lock_filename)
-    sys.exit(1)
+    return 1
 
   print 'Elapsed time: %ds' % (time.time() - start_time)
 
   # Do a clean build.  Remove the build output directory first.
   if sys.platform.startswith('linux'):
     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, aborting' % sys.platform
     _ReleaseLock(lock_file, lock_filename)
-    sys.exit(1)
+    return 1
 
   if options.dry_run:
     print 'shutil.rmtree(%s)' % repr(rm_path)
   else:
     shutil.rmtree(rm_path,True)
 
   if options.preserve_intermediate_dir:
       print 'Preserving intermediate directory.'
   else:
     if options.dry_run:
@@ skipping 63 matching lines @@
                              coverity_password)
   # Avoid echoing the Commit command because it has a password in it
   _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__:
+
+def main():
   option_parser = optparse.OptionParser()
   option_parser.add_option('', '--dry-run', action='store_true', default=False,
                            help='print but don\'t run the commands')
 
   option_parser.add_option('', '--target', default='Release',
                            help='build target (Debug or Release)')
 
   option_parser.add_option('', '--source-dir', dest='source_dir',
                            help='full path to directory ABOVE "src"',
                            default=CHROMIUM_SOURCE_DIR)
@@ skipping 46 matching lines @@
                            help='file containing the coverity password',
                            default='coverity-password')
 
   helpmsg = ('By default, the intermediate dir is emptied before analysis. '
              'This switch disables that behavior.')
   option_parser.add_option('', '--preserve-intermediate-dir',
                            action='store_true', help=helpmsg,
                            default=False)
 
   options, args = option_parser.parse_args()
+  return run_coverity(options, args)
 
-  result = main(options, args)
-  sys.exit(result)
+
+if '__main__' == __name__:
+  sys.exit(main())