summaryrefslogtreecommitdiffstats
path: root/build/android/test_package_executable.py
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 21:20:41 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 21:20:41 +0000
commit3a62d03239d6e7aacdb94650aae6d962badc0c24 (patch)
treeb5a8e135124a6b0a1a5964fff469090de89de5ad /build/android/test_package_executable.py
parentc2a7b56117921597a3d5306681821f9bc69336a5 (diff)
downloadchromium_src-3a62d03239d6e7aacdb94650aae6d962badc0c24.zip
chromium_src-3a62d03239d6e7aacdb94650aae6d962badc0c24.tar.gz
chromium_src-3a62d03239d6e7aacdb94650aae6d962badc0c24.tar.bz2
Fix test data push for APK tests.
test_package.test_suite_basename is used at a lof of places. For APK tests we need to strip "-debug" from the full test name. BUG=125059 TEST= Review URL: https://chromiumcodereview.appspot.com/10406030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/test_package_executable.py')
-rw-r--r--build/android/test_package_executable.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/android/test_package_executable.py b/build/android/test_package_executable.py
index 5a58526..8df609a 100644
--- a/build/android/test_package_executable.py
+++ b/build/android/test_package_executable.py
@@ -158,6 +158,6 @@ class TestPackageExecutable(TestPackage):
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
+ def _GetTestSuiteBaseName(self):
+ """Returns the base name of the test suite."""
+ return os.path.basename(self.test_suite)