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

build/android/pylib/cmd_helper.py

Index: build/android/pylib/cmd_helper.py
diff --git a/build/android/pylib/cmd_helper.py b/build/android/pylib/cmd_helper.py
index 46b6981195ebcecf9b2ed43c1d13eace39d4b00a..6fbf2654503463135a8c8c342dcd49a96797cb0c 100644
--- a/build/android/pylib/cmd_helper.py
+++ b/build/android/pylib/cmd_helper.py
@@ -4,10 +4,11 @@
 
 """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.
@@ -65,3 +66,6 @@ def GetCmdStatusAndOutput(args, cwd=None, shell=False):
     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.