Chromium Code Reviews| Index: build/android/pylib/gtest/single_test_runner.py |
| diff --git a/build/android/pylib/gtest/single_test_runner.py b/build/android/pylib/gtest/single_test_runner.py |
| index 93cc1607af78233c4dfa7acb858c6b6c56a8e2dc..489d0ee209817481a97ea9ea8b1d94016c8acae6 100644 |
| --- a/build/android/pylib/gtest/single_test_runner.py |
| +++ b/build/android/pylib/gtest/single_test_runner.py |
| @@ -84,30 +84,21 @@ class SingleTestRunner(BaseTestRunner): |
| return (self.test_package.test_suite_basename in |
| tests_require_net_test_server) |
| - def _GetFilterFileName(self): |
| - """Returns the filename of gtest filter.""" |
| - return os.path.join( |
| - sys.path[0], 'gtest_filter', |
| - self.test_package.test_suite_basename + '_disabled') |
| - |
| - def _GetAdditionalEmulatorFilterName(self): |
| - """Returns the filename of additional gtest filter for emulator.""" |
| - return os.path.join( |
| - sys.path[0], 'gtest_filter', |
| - self.test_package.test_suite_basename + |
| - '_emulator_additional_disabled') |
| - |
| def GetDisabledTests(self): |
| """Returns a list of disabled tests. |
| Returns: |
| A list of disabled tests obtained from gtest_filter/test_suite_disabled. |
|
frankf
2013/01/10 18:49:05
nit: Update the comment.
|
| """ |
| - disabled_tests = run_tests_helper.GetExpectations(self._GetFilterFileName()) |
| + gtest_filter_base_path = os.path.join( |
| + constants.CHROME_DIR, 'build', 'android', 'pylib', 'gtest', 'filter', |
| + self.test_package.test_suite_basename) |
|
frankf
2013/01/10 18:50:19
Oh, and this can be relative to __file__
|
| + disabled_tests = run_tests_helper.GetExpectations( |
| + gtest_filter_base_path + '_disabled') |
| if self._running_on_emulator: |
| # Append emulator's filter file. |
| disabled_tests.extend(run_tests_helper.GetExpectations( |
| - self._GetAdditionalEmulatorFilterName())) |
| + gtest_filter_base_path + '_emulator_additional_disabled')) |
| return disabled_tests |
| def GetDataFilesForTestSuite(self): |