Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: build/android/pylib/gtest/gtest_test_instance.py

Issue 1413253002: Android: Fix error message when trying to run gtest that is not built (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import logging 5 import logging
6 import os 6 import os
7 import re 7 import re
8 import sys 8 import sys
9 import tempfile 9 import tempfile
10 10
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 } 153 }
154 if self._suite in RUN_IN_SUB_THREAD_TEST_SUITES: 154 if self._suite in RUN_IN_SUB_THREAD_TEST_SUITES:
155 self._extras[_EXTRA_RUN_IN_SUB_THREAD] = 1 155 self._extras[_EXTRA_RUN_IN_SUB_THREAD] = 1
156 if self._suite in BROWSER_TEST_SUITES: 156 if self._suite in BROWSER_TEST_SUITES:
157 self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1 157 self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1
158 self._extras[EXTRA_SHARD_NANO_TIMEOUT] = int(1e9 * self._shard_timeout) 158 self._extras[EXTRA_SHARD_NANO_TIMEOUT] = int(1e9 * self._shard_timeout)
159 self._shard_timeout = 900 159 self._shard_timeout = 900
160 160
161 if not os.path.exists(self._exe_path): 161 if not os.path.exists(self._exe_path):
162 self._exe_path = None 162 self._exe_path = None
163 if not apk_path and not self._exe_path: 163 if not self._apk_helper and not self._exe_path:
164 error_func('Could not find apk or executable for %s' % self._suite) 164 error_func('Could not find apk or executable for %s' % self._suite)
165 165
166 self._data_deps = [] 166 self._data_deps = []
167 if args.test_filter: 167 if args.test_filter:
168 self._gtest_filter = args.test_filter 168 self._gtest_filter = args.test_filter
169 elif args.test_filter_file: 169 elif args.test_filter_file:
170 with open(args.test_filter_file, 'r') as f: 170 with open(args.test_filter_file, 'r') as f:
171 self._gtest_filter = ':'.join(l.strip() for l in f) 171 self._gtest_filter = ':'.join(l.strip() for l in f)
172 else: 172 else:
173 self._gtest_filter = None 173 self._gtest_filter = None
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 return self._apk_helper and self._apk_helper.GetInstrumentationName() 355 return self._apk_helper and self._apk_helper.GetInstrumentationName()
356 356
357 @property 357 @property
358 def shard_timeout(self): 358 def shard_timeout(self):
359 return self._shard_timeout 359 return self._shard_timeout
360 360
361 @property 361 @property
362 def suite(self): 362 def suite(self):
363 return self._suite 363 return self._suite
364 364
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698