am e0bf8162: testrunner: Allow spaces in instrumentation arguments and remove check for test app presence.

Merge commit 'e0bf8162f078d0d9e6170110cd8ab40a8fe8ab1a'

* commit 'e0bf8162f078d0d9e6170110cd8ab40a8fe8ab1a':
  testrunner: Allow spaces in instrumentation arguments and remove check for test
This commit is contained in:
Brett Chabot
2009-07-01 00:07:11 -07:00
committed by The Android Open Source Project
2 changed files with 2 additions and 9 deletions

View File

@@ -275,7 +275,7 @@ class AdbInterface:
(self.DEVICE_TRACE_DIR, instrumentation_path.split(".")[-1]))
for key, value in instrumentation_args.items():
command_string += " -e %s %s" % (key, value)
command_string += " -e %s '%s'" % (key, value)
if raw_mode:
command_string += " -r"
command_string += " -w %s" % instrumentation_path

View File

@@ -165,12 +165,5 @@ def GetTestAppPath():
Returns:
The absolute file path of the Android test app build directory.
Raises:
AbortError: if Android host java library directory could not be found.
"""
path = os.path.join(GetProductOut(), "data", "app")
if not os.path.exists(path):
logger.Log("Error: app path could not be found %s" % path)
raise errors.AbortError
return path
return os.path.join(GetProductOut(), "data", "app")