| OLD | NEW | 
|    1 # Copyright 2013 The Chromium Authors. All rights reserved. |    1 # Copyright 2013 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 """Generates test runner factory and tests for GTests.""" |    5 """Generates test runner factory and tests for GTests.""" | 
|    6 # pylint: disable=W0212 |    6 # pylint: disable=W0212 | 
|    7  |    7  | 
|    8 import logging |    8 import logging | 
|    9 import os |    9 import os | 
|   10 import sys |   10 import sys | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
|   30     'blink_heap_unittests': |   30     'blink_heap_unittests': | 
|   31       'third_party/WebKit/Source/platform/heap/BlinkHeapUnitTests.isolate', |   31       'third_party/WebKit/Source/platform/heap/BlinkHeapUnitTests.isolate', | 
|   32     'breakpad_unittests': 'breakpad/breakpad_unittests.isolate', |   32     'breakpad_unittests': 'breakpad/breakpad_unittests.isolate', | 
|   33     'cc_perftests': 'cc/cc_perftests.isolate', |   33     'cc_perftests': 'cc/cc_perftests.isolate', | 
|   34     'components_browsertests': 'components/components_browsertests.isolate', |   34     'components_browsertests': 'components/components_browsertests.isolate', | 
|   35     'components_unittests': 'components/components_unittests.isolate', |   35     'components_unittests': 'components/components_unittests.isolate', | 
|   36     'content_browsertests': 'content/content_browsertests.isolate', |   36     'content_browsertests': 'content/content_browsertests.isolate', | 
|   37     'content_unittests': 'content/content_unittests.isolate', |   37     'content_unittests': 'content/content_unittests.isolate', | 
|   38     'media_perftests': 'media/media_perftests.isolate', |   38     'media_perftests': 'media/media_perftests.isolate', | 
|   39     'media_unittests': 'media/media_unittests.isolate', |   39     'media_unittests': 'media/media_unittests.isolate', | 
 |   40     'midi_unittests': 'media/midi/midi_unittests.isolate', | 
|   40     'net_unittests': 'net/net_unittests.isolate', |   41     'net_unittests': 'net/net_unittests.isolate', | 
|   41     'sql_unittests': 'sql/sql_unittests.isolate', |   42     'sql_unittests': 'sql/sql_unittests.isolate', | 
|   42     'sync_unit_tests': 'sync/sync_unit_tests.isolate', |   43     'sync_unit_tests': 'sync/sync_unit_tests.isolate', | 
|   43     'ui_base_unittests': 'ui/base/ui_base_tests.isolate', |   44     'ui_base_unittests': 'ui/base/ui_base_tests.isolate', | 
|   44     'unit_tests': 'chrome/unit_tests.isolate', |   45     'unit_tests': 'chrome/unit_tests.isolate', | 
|   45     'webkit_unit_tests': |   46     'webkit_unit_tests': | 
|   46       'third_party/WebKit/Source/web/WebKitUnitTests.isolate', |   47       'third_party/WebKit/Source/web/WebKitUnitTests.isolate', | 
|   47 } |   48 } | 
|   48  |   49  | 
|   49 # Used for filtering large data deps at a finer grain than what's allowed in |   50 # Used for filtering large data deps at a finer grain than what's allowed in | 
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  237     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) |  238     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter) | 
|  238  |  239  | 
|  239   # Coalesce unit tests into a single test per device |  240   # Coalesce unit tests into a single test per device | 
|  240   if (test_options.suite_name != 'content_browsertests' and |  241   if (test_options.suite_name != 'content_browsertests' and | 
|  241       test_options.suite_name != 'components_browsertests'): |  242       test_options.suite_name != 'components_browsertests'): | 
|  242     num_devices = len(devices) |  243     num_devices = len(devices) | 
|  243     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] |  244     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)] | 
|  244     tests = [t for t in tests if t] |  245     tests = [t for t in tests if t] | 
|  245  |  246  | 
|  246   return (TestRunnerFactory, tests) |  247   return (TestRunnerFactory, tests) | 
| OLD | NEW |