| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 from master import master_config | 5 from master import master_config |
| 6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
| 7 | 7 |
| 8 defaults = {} | 8 defaults = {} |
| 9 | 9 |
| 10 helper = master_config.Helper(defaults) | 10 helper = master_config.Helper(defaults) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 'browser_tests', | 28 'browser_tests', |
| 29 'cacheinvalidation_unittests', | 29 'cacheinvalidation_unittests', |
| 30 'cc_unittests', | 30 'cc_unittests', |
| 31 'chromedriver_tests', | 31 'chromedriver_tests', |
| 32 'chromedriver2_unittests', | 32 'chromedriver2_unittests', |
| 33 'components_unittests', | 33 'components_unittests', |
| 34 'content_browsertests', | 34 'content_browsertests', |
| 35 'content_unittests', | 35 'content_unittests', |
| 36 'crypto_unittests', | 36 'crypto_unittests', |
| 37 'device_unittests', | 37 'device_unittests', |
| 38 'events_unittests', |
| 38 'gpu_unittests', | 39 'gpu_unittests', |
| 39 'jingle_unittests', | 40 'jingle_unittests', |
| 40 'media_unittests', | 41 'media_unittests', |
| 41 'net_unittests', | 42 'net_unittests', |
| 42 'ppapi_unittests', | 43 'ppapi_unittests', |
| 43 'printing_unittests', | 44 'printing_unittests', |
| 44 'remoting_unittests', | 45 'remoting_unittests', |
| 45 # http://crbug.com/157234 | 46 # http://crbug.com/157234 |
| 46 #'sync_integration_tests', | 47 #'sync_integration_tests', |
| 47 'sync_unit_tests', | 48 'sync_unit_tests', |
| (...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 B('Win Aura Tests (2)', 'dbg_aura_test_2', 'testers|windows', | 557 B('Win Aura Tests (2)', 'dbg_aura_test_2', 'testers|windows', |
| 557 'win_dbg_aura_trigger', notify_on_missing=True) | 558 'win_dbg_aura_trigger', notify_on_missing=True) |
| 558 F('dbg_aura_test_2', win_tester().ChromiumFactory( | 559 F('dbg_aura_test_2', win_tester().ChromiumFactory( |
| 559 target='Debug', | 560 target='Debug', |
| 560 slave_type='Tester', | 561 slave_type='Tester', |
| 561 build_url=dbg_aura_archive, | 562 build_url=dbg_aura_archive, |
| 562 tests=['browser_tests', | 563 tests=['browser_tests', |
| 563 'chrome_frame_unittests', | 564 'chrome_frame_unittests', |
| 564 'compositor', | 565 'compositor', |
| 565 'content_unittests', | 566 'content_unittests', |
| 567 'events_unittests', |
| 566 'unit_tests', | 568 'unit_tests', |
| 567 'views_unittests', | 569 'views_unittests', |
| 568 ], | 570 ], |
| 569 factory_properties={'process_dumps': True, | 571 factory_properties={'process_dumps': True, |
| 570 'sharded_tests': sharded_tests, | 572 'sharded_tests': sharded_tests, |
| 571 'browser_total_shards': 3, 'browser_shard_index': 2, | 573 'browser_total_shards': 3, 'browser_shard_index': 2, |
| 572 'start_crash_handler': True, | 574 'start_crash_handler': True, |
| 573 'generate_gtest_json': True})) | 575 'generate_gtest_json': True})) |
| 574 | 576 |
| 575 B('Win Aura Tests (3)', 'dbg_aura_test_3', 'testers|windows', | 577 B('Win Aura Tests (3)', 'dbg_aura_test_3', 'testers|windows', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 589 | 591 |
| 590 B('Win8 Aura', 'dbg_aura_win8', 'windows', | 592 B('Win8 Aura', 'dbg_aura_win8', 'windows', |
| 591 'win_dbg_aura_trigger', notify_on_missing=True) | 593 'win_dbg_aura_trigger', notify_on_missing=True) |
| 592 F('dbg_aura_win8', win_tester().ChromiumFactory( | 594 F('dbg_aura_win8', win_tester().ChromiumFactory( |
| 593 target='Debug', | 595 target='Debug', |
| 594 slave_type='Tester', | 596 slave_type='Tester', |
| 595 build_url=dbg_aura_archive, | 597 build_url=dbg_aura_archive, |
| 596 tests=['ash_unittests', | 598 tests=['ash_unittests', |
| 597 'aura', | 599 'aura', |
| 598 'compositor', | 600 'compositor', |
| 601 'events_unittests', |
| 599 'views_unittests', | 602 'views_unittests', |
| 600 ], | 603 ], |
| 601 factory_properties={ | 604 factory_properties={ |
| 602 'generate_gtest_json': True, | 605 'generate_gtest_json': True, |
| 603 'process_dumps': True, | 606 'process_dumps': True, |
| 604 'sharded_tests': sharded_tests, | 607 'sharded_tests': sharded_tests, |
| 605 'start_crash_handler': True, | 608 'start_crash_handler': True, |
| 606 })) | 609 })) |
| 607 | 610 |
| 608 def Update(config, active_master, c): | 611 def Update(config, active_master, c): |
| 609 return helper.Update(c) | 612 return helper.Update(c) |
| OLD | NEW |