OLD | NEW |
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 HTMLParser | 5 import HTMLParser |
6 import logging | 6 import logging |
7 import os | 7 import os |
8 import re | 8 import re |
9 import tempfile | 9 import tempfile |
10 import threading | 10 import threading |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 | 281 |
282 self._data_deps = [] | 282 self._data_deps = [] |
283 if args.test_filter: | 283 if args.test_filter: |
284 self._gtest_filter = args.test_filter | 284 self._gtest_filter = args.test_filter |
285 elif args.test_filter_file: | 285 elif args.test_filter_file: |
286 with open(args.test_filter_file, 'r') as f: | 286 with open(args.test_filter_file, 'r') as f: |
287 self._gtest_filter = ConvertTestFilterFileIntoGTestFilterArgument(f) | 287 self._gtest_filter = ConvertTestFilterFileIntoGTestFilterArgument(f) |
288 else: | 288 else: |
289 self._gtest_filter = None | 289 self._gtest_filter = None |
290 | 290 |
| 291 self._run_disabled = args.run_disabled |
| 292 |
291 self._data_deps_delegate = data_deps_delegate | 293 self._data_deps_delegate = data_deps_delegate |
292 self._runtime_deps_path = args.runtime_deps_path | 294 self._runtime_deps_path = args.runtime_deps_path |
293 if not self._runtime_deps_path: | 295 if not self._runtime_deps_path: |
294 logging.warning('No data dependencies will be pushed.') | 296 logging.warning('No data dependencies will be pushed.') |
295 | 297 |
296 if args.app_data_files: | 298 if args.app_data_files: |
297 self._app_data_files = args.app_data_files | 299 self._app_data_files = args.app_data_files |
298 if args.app_data_file_dir: | 300 if args.app_data_file_dir: |
299 self._app_data_file_dir = args.app_data_file_dir | 301 self._app_data_file_dir = args.app_data_file_dir |
300 else: | 302 else: |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 | 337 |
336 @property | 338 @property |
337 def exe_dist_dir(self): | 339 def exe_dist_dir(self): |
338 return self._exe_dist_dir | 340 return self._exe_dist_dir |
339 | 341 |
340 @property | 342 @property |
341 def extras(self): | 343 def extras(self): |
342 return self._extras | 344 return self._extras |
343 | 345 |
344 @property | 346 @property |
| 347 def gtest_also_run_disabled_tests(self): |
| 348 return self._run_disabled |
| 349 |
| 350 @property |
345 def gtest_filter(self): | 351 def gtest_filter(self): |
346 return self._gtest_filter | 352 return self._gtest_filter |
347 | 353 |
348 @property | 354 @property |
349 def package(self): | 355 def package(self): |
350 return self._apk_helper and self._apk_helper.GetPackageName() | 356 return self._apk_helper and self._apk_helper.GetPackageName() |
351 | 357 |
352 @property | 358 @property |
353 def permissions(self): | 359 def permissions(self): |
354 return self._apk_helper and self._apk_helper.GetPermissions() | 360 return self._apk_helper and self._apk_helper.GetPermissions() |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 for gtest_filter_string in gtest_filter_strings: | 428 for gtest_filter_string in gtest_filter_strings: |
423 logging.debug('Filtering tests using: %s', gtest_filter_string) | 429 logging.debug('Filtering tests using: %s', gtest_filter_string) |
424 filtered_test_list = unittest_util.FilterTestNames( | 430 filtered_test_list = unittest_util.FilterTestNames( |
425 filtered_test_list, gtest_filter_string) | 431 filtered_test_list, gtest_filter_string) |
426 return filtered_test_list | 432 return filtered_test_list |
427 | 433 |
428 def _GenerateDisabledFilterString(self, disabled_prefixes): | 434 def _GenerateDisabledFilterString(self, disabled_prefixes): |
429 disabled_filter_items = [] | 435 disabled_filter_items = [] |
430 | 436 |
431 if disabled_prefixes is None: | 437 if disabled_prefixes is None: |
432 disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_'] | 438 disabled_prefixes = ['FAILS_', 'PRE_', 'MANUAL_'] |
| 439 if not self._run_disabled: |
| 440 disabled_prefixes += ['DISABLED_', 'FLAKY_'] |
| 441 |
433 disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes] | 442 disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes] |
434 disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes] | 443 disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes] |
435 | 444 |
436 disabled_tests_file_path = os.path.join( | 445 disabled_tests_file_path = os.path.join( |
437 host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest', | 446 host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest', |
438 'filter', '%s_disabled' % self._suite) | 447 'filter', '%s_disabled' % self._suite) |
439 if disabled_tests_file_path and os.path.exists(disabled_tests_file_path): | 448 if disabled_tests_file_path and os.path.exists(disabled_tests_file_path): |
440 with open(disabled_tests_file_path) as disabled_tests_file: | 449 with open(disabled_tests_file_path) as disabled_tests_file: |
441 disabled_filter_items += [ | 450 disabled_filter_items += [ |
442 '%s' % l for l in (line.strip() for line in disabled_tests_file) | 451 '%s' % l for l in (line.strip() for line in disabled_tests_file) |
443 if l and not l.startswith('#')] | 452 if l and not l.startswith('#')] |
444 | 453 |
445 return '*-%s' % ':'.join(disabled_filter_items) | 454 return '*-%s' % ':'.join(disabled_filter_items) |
446 | 455 |
447 #override | 456 #override |
448 def TearDown(self): | 457 def TearDown(self): |
449 """Do nothing.""" | 458 """Do nothing.""" |
450 pass | 459 pass |
451 | 460 |
OLD | NEW |