Fix test filter filename for APK based tests.

build/android/single_test_runner.py

Index: build/android/single_test_runner.py
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index 503088cdfb035122b45484ac4f78c80a336f9c8b..69417e6da77bc11a7a5e338457a81c0f10f34559 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -48,11 +48,13 @@ class SingleTestRunner(BaseTestRunner):
     self.fast_and_loose = fast_and_loose
 
     if os.path.splitext(test_suite)[1] == '.apk':
+      self._apk_test_suite = True;

[Yaron, 2012/05/16 21:23:55]

This violates the point of having TestPackage and sub-classing with
TestPackageApk  and TestPackageExecutable. You should just add a helper function
and implement for TestPackageAPk

[John Grabowski, 2012/05/16 22:24:17]

agree.  E.g. use FilterName() as an overridable method.

[nilesh, 2012/05/16 22:36:54]

Done.

       self.test_package = TestPackageApk(
           self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
           tool, self.dump_debug_info)
     else:
+      self._apk_test_suite = False;
       self.test_package = TestPackageExecutable(
           self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
@@ -77,6 +79,10 @@ class SingleTestRunner(BaseTestRunner):
     """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'
+    if self._apk_test_suite:

[John Grabowski, 2012/05/16 22:24:17]

Staging/transition makes for odd choices.
In the future, we'll only use the apk.
For now, we have both.

One option is to use the non-apk version as a "default", then have +test and
-test addition/subtraction.  That'll help keep things clean.  But may not be
worth your time.

+      # APK test suite names end with '-debug.apk'
+      filter_name = self.test_package.test_suite_basename.rsplit(
+          '-debug', 1)[0] + '_disabled'
     disabled_filter = os.path.join(filter_dir, filter_name)
     return disabled_filter