| 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 from . import steps | 5 from . import steps |
| 6 | 6 |
| 7 SPEC = { | 7 SPEC = { |
| 8 'settings': { | 8 'settings': { |
| 9 'build_gs_bucket': 'chromium-mac-archive', | 9 'build_gs_bucket': 'chromium-mac-archive', |
| 10 # WARNING: src-side runtest.py is only tested with chromium CQ builders. | 10 # WARNING: src-side runtest.py is only tested with chromium CQ builders. |
| 11 # Usage not covered by chromium CQ is not supported and can break | 11 # Usage not covered by chromium CQ is not supported and can break |
| 12 # without notice. | 12 # without notice. |
| 13 'src_side_runtest_py': True, | 13 'src_side_runtest_py': True, |
| 14 }, | 14 }, |
| 15 'builders': { | 15 'builders': { |
| 16 'Mac Builder': { | 16 'Mac Builder': { |
| 17 'chromium_config': 'chromium', | 17 'chromium_config': 'chromium', |
| 18 'chromium_apply_config': [ | 18 'chromium_apply_config': [ |
| 19 'archive_gpu_tests', | 19 'archive_gpu_tests', |
| 20 'chrome_with_codecs', | 20 'chrome_with_codecs', |
| 21 'mb', | 21 'mb', |
| 22 'ninja_confirm_noop', | 22 'ninja_confirm_noop', |
| 23 'force_mac_toolchain', |
| 23 ], | 24 ], |
| 24 'gclient_config': 'chromium', | 25 'gclient_config': 'chromium', |
| 25 'chromium_config_kwargs': { | 26 'chromium_config_kwargs': { |
| 26 'BUILD_CONFIG': 'Release', | 27 'BUILD_CONFIG': 'Release', |
| 27 'TARGET_BITS': 64, | 28 'TARGET_BITS': 64, |
| 28 }, | 29 }, |
| 29 'bot_type': 'builder', | 30 'bot_type': 'builder', |
| 30 'compile_targets': [ | 31 'compile_targets': [ |
| 31 'chromium_builder_tests', | 32 'chromium_builder_tests', |
| 32 ], | 33 ], |
| 33 'testing': { | 34 'testing': { |
| 34 'platform': 'mac', | 35 'platform': 'mac', |
| 35 }, | 36 }, |
| 36 'enable_swarming': True, | 37 'enable_swarming': True, |
| 37 'use_isolate': True, | 38 'use_isolate': True, |
| 38 'checkout_dir': 'mac', | 39 'checkout_dir': 'mac', |
| 39 }, | 40 }, |
| 40 'Mac10.9 Tests': { | 41 'Mac10.9 Tests': { |
| 41 'chromium_config': 'chromium', | 42 'chromium_config': 'chromium', |
| 42 'chromium_apply_config': ['ninja_confirm_noop'], | 43 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'], |
| 43 'gclient_config': 'chromium', | 44 'gclient_config': 'chromium', |
| 44 'chromium_config_kwargs': { | 45 'chromium_config_kwargs': { |
| 45 'BUILD_CONFIG': 'Release', | 46 'BUILD_CONFIG': 'Release', |
| 46 'TARGET_BITS': 64, | 47 'TARGET_BITS': 64, |
| 47 }, | 48 }, |
| 48 'bot_type': 'tester', | 49 'bot_type': 'tester', |
| 49 'parent_buildername': 'Mac Builder', | 50 'parent_buildername': 'Mac Builder', |
| 50 'testing': { | 51 'testing': { |
| 51 'platform': 'mac', | 52 'platform': 'mac', |
| 52 }, | 53 }, |
| 53 'enable_swarming': True, | 54 'enable_swarming': True, |
| 54 'swarming_dimensions': { | 55 'swarming_dimensions': { |
| 55 'os': 'Mac-10.9', | 56 'os': 'Mac-10.9', |
| 56 }, | 57 }, |
| 57 }, | 58 }, |
| 58 'Mac10.10 Tests': { | 59 'Mac10.10 Tests': { |
| 59 'chromium_config': 'chromium', | 60 'chromium_config': 'chromium', |
| 60 'chromium_apply_config': ['ninja_confirm_noop'], | 61 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'], |
| 61 'gclient_config': 'chromium', | 62 'gclient_config': 'chromium', |
| 62 'chromium_config_kwargs': { | 63 'chromium_config_kwargs': { |
| 63 'BUILD_CONFIG': 'Release', | 64 'BUILD_CONFIG': 'Release', |
| 64 'TARGET_BITS': 64, | 65 'TARGET_BITS': 64, |
| 65 }, | 66 }, |
| 66 'bot_type': 'tester', | 67 'bot_type': 'tester', |
| 67 'parent_buildername': 'Mac Builder', | 68 'parent_buildername': 'Mac Builder', |
| 68 'testing': { | 69 'testing': { |
| 69 'platform': 'mac', | 70 'platform': 'mac', |
| 70 }, | 71 }, |
| 71 'swarming_dimensions': { | 72 'swarming_dimensions': { |
| 72 'os': 'Mac-10.10', | 73 'os': 'Mac-10.10', |
| 73 }, | 74 }, |
| 74 }, | 75 }, |
| 75 'Mac10.11 Tests': { | 76 'Mac10.11 Tests': { |
| 76 'chromium_config': 'chromium', | 77 'chromium_config': 'chromium', |
| 77 'chromium_apply_config': ['ninja_confirm_noop'], | 78 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'], |
| 78 'gclient_config': 'chromium', | 79 'gclient_config': 'chromium', |
| 79 'chromium_config_kwargs': { | 80 'chromium_config_kwargs': { |
| 80 'BUILD_CONFIG': 'Release', | 81 'BUILD_CONFIG': 'Release', |
| 81 'TARGET_BITS': 64, | 82 'TARGET_BITS': 64, |
| 82 }, | 83 }, |
| 83 'bot_type': 'tester', | 84 'bot_type': 'tester', |
| 84 'parent_buildername': 'Mac Builder', | 85 'parent_buildername': 'Mac Builder', |
| 85 'testing': { | 86 'testing': { |
| 86 'platform': 'mac', | 87 'platform': 'mac', |
| 87 }, | 88 }, |
| 88 }, | 89 }, |
| 89 'Mac Builder (dbg)': { | 90 'Mac Builder (dbg)': { |
| 90 'chromium_config': 'chromium', | 91 'chromium_config': 'chromium', |
| 91 'chromium_apply_config': [ | 92 'chromium_apply_config': [ |
| 92 'mb', | 93 'mb', |
| 93 'ninja_confirm_noop', | 94 'ninja_confirm_noop', |
| 95 'force_mac_toolchain' |
| 94 ], | 96 ], |
| 95 'gclient_config': 'chromium', | 97 'gclient_config': 'chromium', |
| 96 'chromium_config_kwargs': { | 98 'chromium_config_kwargs': { |
| 97 'BUILD_CONFIG': 'Debug', | 99 'BUILD_CONFIG': 'Debug', |
| 98 'TARGET_BITS': 64, | 100 'TARGET_BITS': 64, |
| 99 }, | 101 }, |
| 100 'bot_type': 'builder', | 102 'bot_type': 'builder', |
| 101 'compile_targets': [ | 103 'compile_targets': [ |
| 102 'chromium_builder_tests', | 104 'chromium_builder_tests', |
| 103 ], | 105 ], |
| 104 'testing': { | 106 'testing': { |
| 105 'platform': 'mac', | 107 'platform': 'mac', |
| 106 }, | 108 }, |
| 107 'enable_swarming': True, | 109 'enable_swarming': True, |
| 108 'use_isolate': True, | 110 'use_isolate': True, |
| 109 'checkout_dir': 'mac', | 111 'checkout_dir': 'mac', |
| 110 }, | 112 }, |
| 111 'Mac10.9 Tests (dbg)': { | 113 'Mac10.9 Tests (dbg)': { |
| 112 'chromium_config': 'chromium', | 114 'chromium_config': 'chromium', |
| 113 'chromium_apply_config': ['ninja_confirm_noop'], | 115 'chromium_apply_config': ['ninja_confirm_noop', 'force_mac_toolchain'], |
| 114 'gclient_config': 'chromium', | 116 'gclient_config': 'chromium', |
| 115 'chromium_config_kwargs': { | 117 'chromium_config_kwargs': { |
| 116 'BUILD_CONFIG': 'Debug', | 118 'BUILD_CONFIG': 'Debug', |
| 117 'TARGET_BITS': 64, | 119 'TARGET_BITS': 64, |
| 118 }, | 120 }, |
| 119 'bot_type': 'tester', | 121 'bot_type': 'tester', |
| 120 'parent_buildername': 'Mac Builder (dbg)', | 122 'parent_buildername': 'Mac Builder (dbg)', |
| 121 'testing': { | 123 'testing': { |
| 122 'platform': 'mac', | 124 'platform': 'mac', |
| 123 }, | 125 }, |
| 124 'enable_swarming': True, | 126 'enable_swarming': True, |
| 125 'swarming_dimensions': { | 127 'swarming_dimensions': { |
| 126 'os': 'Mac-10.9', | 128 'os': 'Mac-10.9', |
| 127 }, | 129 }, |
| 128 }, | 130 }, |
| 129 }, | 131 }, |
| 130 } | 132 } |
| OLD | NEW |