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

Unified Diff: build/android/pylib/gtest/single_test_runner.py

Issue 11828034: Move android gtest filter files into pylib dir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addr frankf comments Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/gtest/filter/webkit_unit_tests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8a288c107dcd3c204cd47d45e63b5b3c5fa0ebff 100644
--- a/build/android/pylib/gtest/single_test_runner.py
+++ b/build/android/pylib/gtest/single_test_runner.py
@@ -20,6 +20,9 @@ from test_package_apk import TestPackageApk
from test_package_executable import TestPackageExecutable
+CURFILE_PATH = os.path.abspath(os.path.dirname(__file__))
+
+
class SingleTestRunner(BaseTestRunner):
"""Single test suite attached to a single device.
@@ -84,30 +87,20 @@ 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.
+ A list of disabled tests obtained from 'filter' subdirectory.
"""
- disabled_tests = run_tests_helper.GetExpectations(self._GetFilterFileName())
+ gtest_filter_base_path = os.path.join(
+ CURFILE_PATH, 'filter', self.test_package.test_suite_basename)
+ 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):
« no previous file with comments | « build/android/pylib/gtest/filter/webkit_unit_tests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698