Fix test filter filename for APK based tests.

BUG=125059

TEST=


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

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

3 files changed, 13 insertions, 8 deletions

diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index 503088c..35f1436 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -75,18 +75,14 @@ class SingleTestRunner(BaseTestRunner):
 
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
-    filter_dir = os.path.join(sys.path[0], 'gtest_filter')
-    filter_name = self.test_package.test_suite_basename + '_disabled'
-    disabled_filter = os.path.join(filter_dir, filter_name)
-    return disabled_filter
+    return os.path.join(sys.path[0], 'gtest_filter',
+        self.test_package.GetDisabledTestsBaseFileName() + '_disabled')
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
-    filter_dir = os.path.join(sys.path[0], 'gtest_filter')
-    filter_name = '%s%s' % (self.test_package.test_suite_basename,
+    return os.path.join(sys.path[0], 'gtest_filter',
+        self.test_package.GetDisabledTestsBaseFileName() +
         '_emulator_additional_disabled')
-    disabled_filter = os.path.join(filter_dir, filter_name)
-    return disabled_filter
 
   def GetDisabledTests(self):
     """Returns a list of disabled tests.
diff --git a/build/android/test_package_apk.py b/build/android/test_package_apk.py
index 62b8edf..7def71a 100644
--- a/build/android/test_package_apk.py
+++ b/build/android/test_package_apk.py
@@ -88,3 +88,8 @@ class TestPackageApk(TestPackage):
     self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
                                timeout_time=60*5)
     logging.info('Install has completed.')
+
+  def GetDisabledTestsBaseFileName(self):
+    """Returns the  base filename of gtest filter."""
+    # APK test suite names end with '-debug.apk'
+    return self.test_suite_basename.rsplit('-debug', 1)[0]
diff --git a/build/android/test_package_executable.py b/build/android/test_package_executable.py
index 2e4774c..5a58526 100644
--- a/build/android/test_package_executable.py
+++ b/build/android/test_package_executable.py
@@ -157,3 +157,7 @@ class TestPackageExecutable(TestPackage):
                             '/data/local/tmp/paks/chrome.pak')
       self.adb.PushIfNeeded(self.test_suite_dirname + '/locales/en-US.pak',
                             '/data/local/tmp/paks/en-US.pak')
+
+  def GetDisabledTestsBaseFileName(self):
+    """Returns the base filename of gtest filter."""
+    return self.test_suite_basename