Don't use sys.exit() in build_utils.CheckCallDie().

build/android/gyp/emma_instr.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Instruments classes and jar files.
 
 This script corresponds to the 'emma_instr' action in the java build process.
 Depending on whether emma_instrument is set, the 'emma_instr' action will either
@@ skipping 143 matching lines @@
                               options.sources_file)
   temp_dir = tempfile.mkdtemp()
   try:
     cmd = ['java', '-cp', options.emma_jar,
            'emma', 'instr',
            '-ip', options.input_path,
            '-ix', options.filter_string,
            '-d', temp_dir,
            '-out', coverage_file,
            '-m', 'fullcopy']
-    build_utils.CheckCallDie(cmd, suppress_output=True)
+    build_utils.CheckOutput(cmd)
 
     if command == 'instrument_jar':
       for jar in os.listdir(os.path.join(temp_dir, 'lib')):
         shutil.copy(os.path.join(temp_dir, 'lib', jar),
                     options.output_path)
     else:  # 'instrument_classes'
       if os.path.isdir(options.output_path):
         shutil.rmtree(options.output_path, ignore_errors=True)
       shutil.copytree(os.path.join(temp_dir, 'classes'),
                       options.output_path)
@@ skipping 21 matching lines @@
 
 
 def main(argv):
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))