summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@google.com>2009-06-29 13:55:30 -0700
committerBrett Chabot <brettchabot@google.com>2009-06-29 13:55:30 -0700
commite0bf8162f078d0d9e6170110cd8ab40a8fe8ab1a (patch)
treee2d28b127701173c7c6a1e8bcf19d1d0ace98e57 /testrunner
parent14b3c0c9a440016b996c485b820f1bd57bd63695 (diff)
downloadandroid_development-e0bf8162f078d0d9e6170110cd8ab40a8fe8ab1a.tar.gz
android_development-e0bf8162f078d0d9e6170110cd8ab40a8fe8ab1a.tar.bz2
android_development-e0bf8162f078d0d9e6170110cd8ab40a8fe8ab1a.zip
testrunner: Allow spaces in instrumentation arguments and remove check for test
app presence.
Diffstat (limited to 'testrunner')
-rwxr-xr-xtestrunner/adb_interface.py2
-rw-r--r--testrunner/android_build.py9
2 files changed, 2 insertions, 9 deletions
diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index 33191f7d5..698ea8bc0 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -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
diff --git a/testrunner/android_build.py b/testrunner/android_build.py
index 37ddf9e65..584ef5279 100644
--- a/testrunner/android_build.py
+++ b/testrunner/android_build.py
@@ -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")