Modify the Android test running scripts so they can be used from WebKit

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 subprocess
 
+import constants
 
 def RunCmd(args, cwd=None):
   """Opens a subprocess to execute a program and returns its return value.
 
   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.
 
@@ skipping 37 matching lines @@
   """
   logging.info(str(args) + ' ' + (cwd or ''))
   p = subprocess.Popen(args=args, cwd=cwd, stdout=subprocess.PIPE,
                        stderr=subprocess.PIPE, shell=shell)
   stdout, stderr = p.communicate()
   exit_code = p.returncode
   if stderr:
     logging.critical(stderr)
   logging.info(stdout[:4096])  # Truncate output longer than 4k.
   return (exit_code, stdout)
+
+def OutDirectory():
+  return os.environ.get('ANDROID_TEST_OUT_DIRECTORY', constants.CHROME_DIR)

[bulach, 2012/11/15 01:06:39]

sorry, when I mentioned to use an environment variable, I didn't mean internally
in the scripts, I was thinking that the external caller could set this... :)

if it's being set as a command line option, it's better to just have a global
state here...
maybe best to encapsulate in something like:

class OutDirectory(object):
  _out_directory = constants.CHROME_DIR
  @staticmethod
  def Set(out_directory):
    OutDirectory._out_directory = out_directory
  @staticmethod
  def get():
    return OutDirectory._out_directory


...
wdyt?

[Peter Beverloo, 2012/11/15 12:11:29]

Seems good to me, thank you! Done. In general we're trying to reduce the number
of environment variables used, so the argument seems like a better option. I've
s/Set/set/ in your code per the style guide.