[Android] Reduce test logging verbosity.

build/android/pylib/cmd_helper.py

 # Copyright (c) 2012 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.
 
 """A wrapper for subprocess to make calling shell commands easier."""
 
 import os
 import logging
+import pipes
 import signal
 import subprocess
 import tempfile
 
 import constants
 
 
 def _Call(args, stdout=None, stderr=None, shell=None, cwd=None):
   return subprocess.call(
       args=args, cwd=cwd, stdout=stdout, stderr=stderr,
@@ skipping 41 matching lines @@
   Args:
     args: A string or a sequence of program arguments. The program to execute is
       the string or the first item in the args sequence.
     cwd: If not None, the subprocess's current directory will be changed to
       |cwd| before it's executed.
     shell: Whether to execute args as a shell command.
 
   Returns:
     The tuple (exit code, output).
   """
-  logging.info(str(args) + ' ' + (cwd or ''))
+  if isinstance(args, basestring):
+    args_repr = args
+    if not shell:
+      raise Exception('string args must be run with shell=True')
+  elif shell:
+    raise Exception('array args must be run with shell=False')
+  else:
+    args_repr = ' '.join(map(pipes.quote, args))
+
+  s = '[host]'
+  if cwd:
+    s += ':' + cwd
+  s += '> ' + args_repr
+  logging.info(s)
   tmpout = tempfile.TemporaryFile(bufsize=0)
   tmperr = tempfile.TemporaryFile(bufsize=0)
   exit_code = _Call(args, cwd=cwd, stdout=tmpout, stderr=tmperr, shell=shell)
   tmperr.seek(0)
   stderr = tmperr.read()
   tmperr.close()
   if stderr:
     logging.critical(stderr)
   tmpout.seek(0)
   stdout = tmpout.read()
   tmpout.close()
-  logging.info(stdout[:4096])  # Truncate output longer than 4k.
+  if len(stdout) > 4096:
+    logging.debug('Truncated output:')
+  logging.debug(stdout[:4096])
   return (exit_code, stdout)
 
 
 class OutDirectory(object):
   _out_directory = os.path.join(constants.CHROME_DIR, 'out')
   @staticmethod
   def set(out_directory):
     OutDirectory._out_directory = out_directory
   @staticmethod
   def get():
     return OutDirectory._out_directory