diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-05-21 19:54:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 02:55:28 +0000 |
| commit | 08b097a938942684558910dc9ca662c2a59ce3d2 (patch) | |
| tree | af312ac363fde0b33d7a5d5ab6e09c8e3beda68d /build/android/pylib/gtest/gtest_test_instance.py | |
| parent | 148c14c642a2a6cecea8be55edb89cc6e353e527 (diff) | |
| download | chromium_src-08b097a938942684558910dc9ca662c2a59ce3d2.zip chromium_src-08b097a938942684558910dc9ca662c2a59ce3d2.tar.gz chromium_src-08b097a938942684558910dc9ca662c2a59ce3d2.tar.bz2 | |
[Android] Refactor the native test wrappers. (RELAND)
This is a reland of https://codereview.chromium.org/1126543009/, which
broke gtests built by GN.
BUG=476410
Review URL: https://codereview.chromium.org/1143903002
Cr-Commit-Position: refs/heads/master@{#331056}
Diffstat (limited to 'build/android/pylib/gtest/gtest_test_instance.py')
| -rw-r--r-- | build/android/pylib/gtest/gtest_test_instance.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py index b6f83b3..cea5016 100644 --- a/build/android/pylib/gtest/gtest_test_instance.py +++ b/build/android/pylib/gtest/gtest_test_instance.py @@ -17,6 +17,12 @@ sys.path.append(os.path.join( import unittest_util +BROWSER_TEST_SUITES = [ + 'components_browsertests', + 'content_browsertests', +] + + # Used for filtering large data deps at a finer grain than what's allowed in # isolate files since pushing deps to devices is expensive. # Wildcards are allowed. @@ -92,16 +98,9 @@ class GtestTestInstance(test_instance.TestInstance): raise ValueError('Platform mode currently supports only 1 gtest suite') self._suite = args.suite_name[0] - if (self._suite == 'content_browsertests' or - self._suite == 'components_browsertests'): - error_func('%s are not currently supported ' - 'in platform mode.' % self._suite) - self._apk_path = os.path.join( - constants.GetOutDirectory(), 'apks', '%s.apk' % self._suite) - else: - self._apk_path = os.path.join( - constants.GetOutDirectory(), '%s_apk' % self._suite, - '%s-debug.apk' % self._suite) + self._apk_path = os.path.join( + constants.GetOutDirectory(), '%s_apk' % self._suite, + '%s-debug.apk' % self._suite) self._exe_path = os.path.join(constants.GetOutDirectory(), self._suite) if not os.path.exists(self._apk_path): |