Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1110)

Unified Diff: build/android/pylib/test_package_apk.py

Issue 10804003: Android: fix test runners for non-rooted devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | testing/android/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/test_package_apk.py
diff --git a/build/android/pylib/test_package_apk.py b/build/android/pylib/test_package_apk.py
index a5fbf6b344dc556a40a7ac0c5e7e5d27fdd83c23..de6fdb7c9ede28ced655ff2916b924ff9a6de075 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)
« no previous file with comments | « no previous file | testing/android/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698