diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 12:24:44 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 12:24:44 +0000 |
| commit | 21bbc2099f10c46a6ac1c9a9411a015fb50cfd16 (patch) | |
| tree | de2563c5d0990b9b9d1acd97f32235a5b733a97f /build/android/pylib | |
| parent | 2cf8a187dd1bff4ad43aa1a8b61d040a1bc982e9 (diff) | |
| download | chromium_src-21bbc2099f10c46a6ac1c9a9411a015fb50cfd16.zip chromium_src-21bbc2099f10c46a6ac1c9a9411a015fb50cfd16.tar.gz chromium_src-21bbc2099f10c46a6ac1c9a9411a015fb50cfd16.tar.bz2 | |
Android: fix test runners for non-rooted devices.
Move the generated file for GetAllTests() to a public directory in the device.
Adds the necessary permission to the manifest for the test.
BUG=
TEST=run android tests in a non-rooted device.
Review URL: https://chromiumcodereview.appspot.com/10804003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib')
| -rw-r--r-- | build/android/pylib/test_package_apk.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/android/pylib/test_package_apk.py b/build/android/pylib/test_package_apk.py index a5fbf6b..de6fdb7 100644 --- a/build/android/pylib/test_package_apk.py +++ b/build/android/pylib/test_package_apk.py @@ -29,7 +29,10 @@ class TestPackageApk(TestPackage): dump_debug_info: A debug_info object. """ - APK_DATA_DIR = '/data/user/0/org.chromium.native_test/files/' + # The stdout.txt path is determined by: + # testing/android/java/src/org/chromium/native_test/ + # ChromeNativeTestActivity.java + APK_STDOUT_FILE = '/sdcard/native_tests/stdout.txt' def __init__(self, adb, device, test_suite, timeout, rebaseline, performance_test, cleanup_test_files, tool, @@ -69,8 +72,7 @@ class TestPackageApk(TestPackage): # Copy stdout.txt and read contents. stdout_file = tempfile.NamedTemporaryFile() ret = [] - self.adb.Adb().Pull(TestPackageApk.APK_DATA_DIR + 'stdout.txt', - stdout_file.name) + self.adb.Adb().Pull(TestPackageApk.APK_STDOUT_FILE, stdout_file.name) # We need to strip the trailing newline. content = [line.rstrip() for line in open(stdout_file.name)] ret = self._ParseGTestListTests(content) |