| Index: build/android/pylib/gtest/gtest_test_instance.py
|
| diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
|
| index 1e8769310e7d797dc0d872e01a1b0972d31e9551..f4623e414a3e5719f6aba7a9de4fb1ff98c3b685 100644
|
| --- a/build/android/pylib/gtest/gtest_test_instance.py
|
| +++ b/build/android/pylib/gtest/gtest_test_instance.py
|
| @@ -42,9 +42,12 @@ class GtestTestInstance(test_instance.TestInstance):
|
|
|
| def __init__(self, options, isolate_delegate):
|
| super(GtestTestInstance, self).__init__()
|
| + # TODO(jbudorick): Support multiple test suites.
|
| + if len(options.suite_name) > 1:
|
| + raise ValueError('Platform mode currently supports only 1 gtest suite')
|
| self._apk_path = os.path.join(
|
| - constants.GetOutDirectory(), '%s_apk' % options.suite_name,
|
| - '%s-debug.apk' % options.suite_name)
|
| + constants.GetOutDirectory(), '%s_apk' % options.suite_name[0],
|
| + '%s-debug.apk' % options.suite_name[0])
|
| self._data_deps = []
|
| self._gtest_filter = options.test_filter
|
| if options.isolate_file_path:
|
|
|