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

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

Issue 1127133004: Remove ICS support from build/android/pylib/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 5 years, 7 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
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 TestPackageExecutable to help run stand-alone executables.""" 5 """Defines TestPackageExecutable to help run stand-alone executables."""
6 6
7 import logging 7 import logging
8 import os 8 import os
9 import posixpath 9 import posixpath
10 import sys 10 import sys
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 logging.info('Conents of the test runner script: ') 109 logging.info('Conents of the test runner script: ')
110 for line in open(sh_script_file.name).readlines(): 110 for line in open(sh_script_file.name).readlines():
111 logging.info(' ' + line.rstrip()) 111 logging.info(' ' + line.rstrip())
112 112
113 #override 113 #override
114 def GetAllTests(self, device): 114 def GetAllTests(self, device):
115 lib_path = posixpath.join( 115 lib_path = posixpath.join(
116 constants.TEST_EXECUTABLE_DIR, '%s_deps' % self.suite_name) 116 constants.TEST_EXECUTABLE_DIR, '%s_deps' % self.suite_name)
117 117
118 cmd = [] 118 cmd = []
119 for wrapper in (device.GetDevicePieWrapper(), self.tool.GetTestWrapper()): 119 if self.tool.GetTestWrapper():
120 if wrapper: 120 cmd.append(self.tool.GetTestWrapper())
121 cmd.append(wrapper)
122 cmd.extend([ 121 cmd.extend([
123 posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name), 122 posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name),
124 '--gtest_list_tests']) 123 '--gtest_list_tests'])
125 124
126 output = device.RunShellCommand( 125 output = device.RunShellCommand(
127 cmd, check_return=True, env={'LD_LIBRARY_PATH': lib_path}) 126 cmd, check_return=True, env={'LD_LIBRARY_PATH': lib_path})
128 return gtest_test_instance.ParseGTestListTests(output) 127 return gtest_test_instance.ParseGTestListTests(output)
129 128
130 #override 129 #override
131 def SpawnTestProcess(self, device): 130 def SpawnTestProcess(self, device):
(...skipping 19 matching lines...) Expand all
151 'stripped binary (%s, timestamp %d) older than ' 150 'stripped binary (%s, timestamp %d) older than '
152 'source binary (%s, timestamp %d), build target %s' % 151 'source binary (%s, timestamp %d), build target %s' %
153 (target_name, target_mtime, self.suite_path, source_mtime, 152 (target_name, target_mtime, self.suite_path, source_mtime,
154 self.suite_name + '_stripped')) 153 self.suite_name + '_stripped'))
155 154
156 test_binary_path = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name 155 test_binary_path = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name
157 device.PushChangedFiles([(target_name, test_binary_path)]) 156 device.PushChangedFiles([(target_name, test_binary_path)])
158 deps_path = self.suite_path + '_deps' 157 deps_path = self.suite_path + '_deps'
159 if os.path.isdir(deps_path): 158 if os.path.isdir(deps_path):
160 device.PushChangedFiles([(deps_path, test_binary_path + '_deps')]) 159 device.PushChangedFiles([(deps_path, test_binary_path + '_deps')])
OLDNEW
« no previous file with comments | « build/android/pylib/device_settings.py ('k') | build/android/pylib/instrumentation/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698