| OLD | NEW | 
|    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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  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  |  160  | 
|  161   def GetDisabledTestsBaseFileName(self): |  161   def _GetTestSuiteBaseName(self): | 
|  162     """Returns the base filename of gtest filter.""" |  162     """Returns the  base name of the test suite.""" | 
|  163     return self.test_suite_basename |  163     return os.path.basename(self.test_suite) | 
| OLD | NEW |