diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 15:41:56 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 15:41:56 +0000 |
| commit | 117cae2668f9004d64df74a642591d41f6bfef2b (patch) | |
| tree | 8bac2070ce22ef875628773d717fd858caf4aa58 /build/android/pylib/test_package_executable.py | |
| parent | 3ac8b1c27bd58b0476648678f076150ff60a8713 (diff) | |
| download | chromium_src-117cae2668f9004d64df74a642591d41f6bfef2b.zip chromium_src-117cae2668f9004d64df74a642591d41f6bfef2b.tar.gz chromium_src-117cae2668f9004d64df74a642591d41f6bfef2b.tar.bz2 | |
Android: upstream latest changes for build/android.
- uses $EXTERNAL_STORAGE rather than /sdcard
- split PerfTEstSetup from android_commands.py
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10914199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/test_package_executable.py')
| -rw-r--r-- | build/android/pylib/test_package_executable.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build/android/pylib/test_package_executable.py b/build/android/pylib/test_package_executable.py index 359de3a..292bac4 100644 --- a/build/android/pylib/test_package_executable.py +++ b/build/android/pylib/test_package_executable.py @@ -18,7 +18,7 @@ from test_package import TestPackage class TestPackageExecutable(TestPackage): """A helper class for running stand-alone executables.""" - _TEST_RUNNER_RET_VAL_FILE = constants.TEST_DATA_DIR + '/gtest_retval' + _TEST_RUNNER_RET_VAL_FILE = 'gtest_retval' def __init__(self, adb, device, test_suite, timeout, rebaseline, performance_test, cleanup_test_files, tool, dump_debug_info, @@ -48,7 +48,9 @@ class TestPackageExecutable(TestPackage): ret_code_file = tempfile.NamedTemporaryFile() try: if not self.adb.Adb().Pull( - TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE, ret_code_file.name): + self.adb.GetExternalStorage() + '/' + + TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE, + ret_code_file.name): logging.critical('Unable to pull gtest ret val file %s', ret_code_file.name) raise ValueError @@ -74,7 +76,8 @@ class TestPackageExecutable(TestPackage): logging.info('NATIVE_COVERAGE_DEPTH_STRIP is not defined: ' 'No native coverage.') return '' - export_string = 'export GCOV_PREFIX="%s/gcov"\n' % constants.TEST_DATA_DIR + export_string = ('export GCOV_PREFIX="%s/gcov"\n' % + self.adb.GetExternalStorage()) export_string += 'export GCOV_PREFIX_STRIP=%s\n' % depth return export_string |