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

Side by Side Diff: build/android/test_package_executable.py

Issue 10391172: Fix test filter filename for APK based tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed the if-else logic from single_test_runner Created 8 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 | Annotate | Revision Log
« no previous file with comments | « build/android/test_package_apk.py ('k') | no next file » | 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 5
6 import logging 6 import logging
7 import os 7 import os
8 import pexpect 8 import pexpect
9 import shutil 9 import shutil
10 import sys 10 import sys
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 strip = os.environ['STRIP'] 150 strip = os.environ['STRIP']
151 cmd_helper.RunCmd([strip, self.test_suite, '-o', target_name]) 151 cmd_helper.RunCmd([strip, self.test_suite, '-o', target_name])
152 test_binary = '/data/local/' + self.test_suite_basename 152 test_binary = '/data/local/' + self.test_suite_basename
153 self.adb.PushIfNeeded(target_name, test_binary) 153 self.adb.PushIfNeeded(target_name, test_binary)
154 154
155 if self.test_suite_basename == 'ui_unittests': 155 if self.test_suite_basename == 'ui_unittests':
156 self.adb.PushIfNeeded(self.test_suite_dirname + '/chrome.pak', 156 self.adb.PushIfNeeded(self.test_suite_dirname + '/chrome.pak',
157 '/data/local/tmp/paks/chrome.pak') 157 '/data/local/tmp/paks/chrome.pak')
158 self.adb.PushIfNeeded(self.test_suite_dirname + '/locales/en-US.pak', 158 self.adb.PushIfNeeded(self.test_suite_dirname + '/locales/en-US.pak',
159 '/data/local/tmp/paks/en-US.pak') 159 '/data/local/tmp/paks/en-US.pak')
160
161 def GetDisabledTestsBaseFileName(self):
162 """Returns the base filename of gtest filter."""
163 return self.test_suite_basename
OLDNEW
« no previous file with comments | « build/android/test_package_apk.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698