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

Side by Side Diff: build/android/pylib/gtest/test_package_apk.py

Issue 646523002: [Android] Add zip pushing and refine push mode selection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix findbugs issues. Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « build/android/pylib/forwarder.py ('k') | build/android/pylib/gtest/test_package_exe.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Defines TestPackageApk to help run APK-based native tests.""" 5 """Defines TestPackageApk to help run APK-based native tests."""
6 # pylint: disable=W0212 6 # pylint: disable=W0212
7 7
8 import logging 8 import logging
9 import os 9 import os
10 import shlex 10 import shlex
(...skipping 26 matching lines...) Expand all
37 self.suite_path = os.path.join( 37 self.suite_path = os.path.join(
38 constants.GetOutDirectory(), '%s_apk' % suite_name, 38 constants.GetOutDirectory(), '%s_apk' % suite_name,
39 '%s-debug.apk' % suite_name) 39 '%s-debug.apk' % suite_name)
40 self._package_info = constants.PACKAGE_INFO['gtest'] 40 self._package_info = constants.PACKAGE_INFO['gtest']
41 41
42 def _CreateCommandLineFileOnDevice(self, device, options): 42 def _CreateCommandLineFileOnDevice(self, device, options):
43 command_line_file = tempfile.NamedTemporaryFile() 43 command_line_file = tempfile.NamedTemporaryFile()
44 # GTest expects argv[0] to be the executable path. 44 # GTest expects argv[0] to be the executable path.
45 command_line_file.write(self.suite_name + ' ' + options) 45 command_line_file.write(self.suite_name + ' ' + options)
46 command_line_file.flush() 46 command_line_file.flush()
47 device.PushChangedFiles( 47 device.PushChangedFiles([(
48 command_line_file.name, 48 command_line_file.name,
49 self._package_info.cmdline_file) 49 self._package_info.cmdline_file)])
50 50
51 def _GetFifo(self): 51 def _GetFifo(self):
52 # The test.fifo path is determined by: 52 # The test.fifo path is determined by:
53 # testing/android/java/src/org/chromium/native_test/ 53 # testing/android/java/src/org/chromium/native_test/
54 # ChromeNativeTestActivity.java and 54 # ChromeNativeTestActivity.java and
55 # testing/android/native_test_launcher.cc 55 # testing/android/native_test_launcher.cc
56 return '/data/data/' + self._package_info.package + '/files/test.fifo' 56 return '/data/data/' + self._package_info.package + '/files/test.fifo'
57 57
58 def _ClearFifo(self, device): 58 def _ClearFifo(self, device):
59 device.RunShellCommand('rm -f ' + self._GetFifo()) 59 device.RunShellCommand('rm -f ' + self._GetFifo())
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 self._StartActivity(device) 126 self._StartActivity(device)
127 finally: 127 finally:
128 self.tool.CleanUpEnvironment() 128 self.tool.CleanUpEnvironment()
129 logfile = android_commands.NewLineNormalizer(sys.stdout) 129 logfile = android_commands.NewLineNormalizer(sys.stdout)
130 return self._WatchFifo(device, timeout=10, logfile=logfile) 130 return self._WatchFifo(device, timeout=10, logfile=logfile)
131 131
132 #override 132 #override
133 def Install(self, device): 133 def Install(self, device):
134 self.tool.CopyFiles() 134 self.tool.CopyFiles()
135 device.Install(self.suite_path) 135 device.Install(self.suite_path)
OLDNEW
« no previous file with comments | « build/android/pylib/forwarder.py ('k') | build/android/pylib/gtest/test_package_exe.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698