| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  342   def _initializeCommandLineFlags(self, args): |  342   def _initializeCommandLineFlags(self, args): | 
|  343     self._flags = [] |  343     self._flags = [] | 
|  344     if args.command_line_flags: |  344     if args.command_line_flags: | 
|  345       self._flags.extend(args.command_line_flags) |  345       self._flags.extend(args.command_line_flags) | 
|  346     if args.device_flags_file: |  346     if args.device_flags_file: | 
|  347       with open(args.device_flags_file) as f: |  347       with open(args.device_flags_file) as f: | 
|  348         stripped_lines = (l.strip() for l in f) |  348         stripped_lines = (l.strip() for l in f) | 
|  349         self._flags.extend(flag for flag in stripped_lines if flag) |  349         self._flags.extend(flag for flag in stripped_lines if flag) | 
|  350     if args.run_disabled: |  350     if args.run_disabled: | 
|  351       self._flags.append('--gtest_also_run_disabled_tests') |  351       self._flags.append('--gtest_also_run_disabled_tests') | 
|  352     if args.test_arguments: |  | 
|  353       self._flags.extend(args.test_arguments.split()) |  | 
|  354  |  352  | 
|  355   @property |  353   @property | 
|  356   def activity(self): |  354   def activity(self): | 
|  357     return self._apk_helper and self._apk_helper.GetActivityName() |  355     return self._apk_helper and self._apk_helper.GetActivityName() | 
|  358  |  356  | 
|  359   @property |  357   @property | 
|  360   def apk(self): |  358   def apk(self): | 
|  361     return self._apk_helper and self._apk_helper.path |  359     return self._apk_helper and self._apk_helper.path | 
|  362  |  360  | 
|  363   @property |  361   @property | 
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  504             '%s' % l for l in (line.strip() for line in disabled_tests_file) |  502             '%s' % l for l in (line.strip() for line in disabled_tests_file) | 
|  505             if l and not l.startswith('#')] |  503             if l and not l.startswith('#')] | 
|  506  |  504  | 
|  507     return '*-%s' % ':'.join(disabled_filter_items) |  505     return '*-%s' % ':'.join(disabled_filter_items) | 
|  508  |  506  | 
|  509   #override |  507   #override | 
|  510   def TearDown(self): |  508   def TearDown(self): | 
|  511     """Do nothing.""" |  509     """Do nothing.""" | 
|  512     pass |  510     pass | 
|  513  |  511  | 
| OLD | NEW |