Move android gtest filter files into pylib dir

As part of a general refactor of build/android, clean up
gtest_filter by moving those files to a better location.

BUG=167331
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11828034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176649 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 9 insertions, 16 deletions

diff --git a/build/android/gtest_filter/base_unittests_disabled b/build/android/pylib/gtest/filter/base_unittests_disabled
index 37bf65b..37bf65b 100644
--- a/build/android/gtest_filter/base_unittests_disabled
+++ b/build/android/pylib/gtest/filter/base_unittests_disabled
diff --git a/build/android/gtest_filter/base_unittests_emulator_additional_disabled b/build/android/pylib/gtest/filter/base_unittests_emulator_additional_disabled
index 85e8fd6..85e8fd6 100644
--- a/build/android/gtest_filter/base_unittests_emulator_additional_disabled
+++ b/build/android/pylib/gtest/filter/base_unittests_emulator_additional_disabled
diff --git a/build/android/gtest_filter/breakpad_unittests_disabled b/build/android/pylib/gtest/filter/breakpad_unittests_disabled
index 32b07c9..32b07c9 100644
--- a/build/android/gtest_filter/breakpad_unittests_disabled
+++ b/build/android/pylib/gtest/filter/breakpad_unittests_disabled
diff --git a/build/android/gtest_filter/content_unittests_disabled b/build/android/pylib/gtest/filter/content_unittests_disabled
index 0c3854f..0c3854f 100644
--- a/build/android/gtest_filter/content_unittests_disabled
+++ b/build/android/pylib/gtest/filter/content_unittests_disabled
diff --git a/build/android/gtest_filter/ipc_tests_disabled b/build/android/pylib/gtest/filter/ipc_tests_disabled
index fcd5e73..fcd5e73 100644
--- a/build/android/gtest_filter/ipc_tests_disabled
+++ b/build/android/pylib/gtest/filter/ipc_tests_disabled
diff --git a/build/android/gtest_filter/media_unittests_disabled b/build/android/pylib/gtest/filter/media_unittests_disabled
index 2690683..2690683 100644
--- a/build/android/gtest_filter/media_unittests_disabled
+++ b/build/android/pylib/gtest/filter/media_unittests_disabled
diff --git a/build/android/gtest_filter/net_unittests_disabled b/build/android/pylib/gtest/filter/net_unittests_disabled
index 7828aec..7828aec 100644
--- a/build/android/gtest_filter/net_unittests_disabled
+++ b/build/android/pylib/gtest/filter/net_unittests_disabled
diff --git a/build/android/gtest_filter/sync_unit_tests_disabled b/build/android/pylib/gtest/filter/sync_unit_tests_disabled
index cc4b72d..cc4b72d 100644
--- a/build/android/gtest_filter/sync_unit_tests_disabled
+++ b/build/android/pylib/gtest/filter/sync_unit_tests_disabled
diff --git a/build/android/gtest_filter/ui_unittests_disabled b/build/android/pylib/gtest/filter/ui_unittests_disabled
index 6515b19..6515b19 100644
--- a/build/android/gtest_filter/ui_unittests_disabled
+++ b/build/android/pylib/gtest/filter/ui_unittests_disabled
diff --git a/build/android/gtest_filter/unit_tests_disabled b/build/android/pylib/gtest/filter/unit_tests_disabled
index 9228542..9228542 100644
--- a/build/android/gtest_filter/unit_tests_disabled
+++ b/build/android/pylib/gtest/filter/unit_tests_disabled
diff --git a/build/android/gtest_filter/webkit_unit_tests_disabled b/build/android/pylib/gtest/filter/webkit_unit_tests_disabled
index a0864d3..a0864d3 100644
--- a/build/android/gtest_filter/webkit_unit_tests_disabled
+++ b/build/android/pylib/gtest/filter/webkit_unit_tests_disabled
diff --git a/build/android/pylib/gtest/single_test_runner.py b/build/android/pylib/gtest/single_test_runner.py
index 93cc160..8a288c1 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):