| OLD | NEW |
|---|
| 1 { | 1 { |
| 2 "Android GN Builder (dbg)": { | 2 "Android GN Builder (dbg)": { |
| 3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
| 4 "blimp_tests", | 4 "blimp_tests", |
| 5 "chrome_public_apk", | 5 "chrome_public_apk", |
| 6 "chrome_public_test_apk", | 6 "chrome_public_test_apk", |
| 7 "content_shell_apk", | 7 "content_shell_apk", |
| 8 "content_shell_test_apk", | 8 "content_shell_test_apk", |
| 9 "system_webview_apk" | 9 "system_webview_apk" |
| 10 ] | 10 ] |
| 11 }, | 11 }, |
| 12 "Android Swarm Builder": { | 12 "Android Swarm Builder": { |
| 13 "gtest_tests": [ | 13 "gtest_tests": [ |
| 14 { | 14 { |
| 15 "swarming": { | 15 "swarming": { |
| 16 "can_use_on_swarming_builders": true, | 16 "can_use_on_swarming_builders": true, |
| 17 "dimension_sets": [ | 17 "dimension_sets": [ |
| 18 { | 18 { |
| 19 "device_os": "KTU84P", | 19 "device_os": "KTU84P", |
| 20 "device_type": "hammerhead" | 20 "device_type": "hammerhead" |
| 21 } | 21 } |
| 22 ], |
| 23 "hard_timeout": 960 |
| 24 }, |
| 25 "test": "android_webview_test" |
| 26 }, |
| 27 { |
| 28 "swarming": { |
| 29 "can_use_on_swarming_builders": true, |
| 30 "dimension_sets": [ |
| 31 { |
| 32 "device_os": "KTU84P", |
| 33 "device_type": "hammerhead" |
| 34 } |
| 22 ] | 35 ] |
| 23 }, | 36 }, |
| 24 "test": "android_webview_unittests" | 37 "test": "android_webview_unittests" |
| 25 }, | 38 }, |
| 26 { | 39 { |
| 27 "swarming": { | 40 "swarming": { |
| 28 "can_use_on_swarming_builders": true, | 41 "can_use_on_swarming_builders": true, |
| 29 "dimension_sets": [ | 42 "dimension_sets": [ |
| 30 { | 43 { |
| 31 "device_os": "KTU84P", | 44 "device_os": "KTU84P", |
| 32 "device_type": "hammerhead" | 45 "device_type": "hammerhead" |
| 33 } | 46 } |
| 34 ] | 47 ] |
| 35 }, | 48 }, |
| 36 "test": "base_unittests" | 49 "test": "base_unittests" |
| 37 }, | 50 }, |
| 38 { | 51 { |
| 39 "swarming": { | 52 "swarming": { |
| 40 "can_use_on_swarming_builders": true, | 53 "can_use_on_swarming_builders": true, |
| 41 "dimension_sets": [ | 54 "dimension_sets": [ |
| 42 { | 55 { |
| 43 "device_os": "KTU84P", | 56 "device_os": "KTU84P", |
| 44 "device_type": "hammerhead" | 57 "device_type": "hammerhead" |
| 45 } | 58 } |
| 46 ] | 59 ], |
| 60 "hard_timeout": 960 |
| 47 }, | 61 }, |
| 48 "test": "blimp_unittests" | 62 "test": "blimp_test" |
| 49 }, | 63 }, |
| 50 { | 64 { |
| 51 "swarming": { | 65 "swarming": { |
| 52 "can_use_on_swarming_builders": true, | 66 "can_use_on_swarming_builders": true, |
| 53 "dimension_sets": [ | 67 "dimension_sets": [ |
| 54 { | 68 { |
| 55 "device_os": "KTU84P", | 69 "device_os": "KTU84P", |
| 56 "device_type": "hammerhead" | 70 "device_type": "hammerhead" |
| 57 } | 71 } |
| 58 ] | 72 ] |
| 59 }, | 73 }, |
| 60 "test": "breakpad_unittests" | 74 "test": "blimp_unittests" |
| 61 }, | 75 }, |
| 62 { | 76 { |
| 63 "swarming": { | 77 "swarming": { |
| 64 "can_use_on_swarming_builders": true, | 78 "can_use_on_swarming_builders": true, |
| 65 "dimension_sets": [ | 79 "dimension_sets": [ |
| 66 { | 80 { |
| 67 "device_os": "KTU84P", | 81 "device_os": "KTU84P", |
| 68 "device_type": "hammerhead" | 82 "device_type": "hammerhead" |
| 69 } | 83 } |
| 70 ] | 84 ] |
| 71 }, | 85 }, |
| 72 "test": "cc_unittests" | 86 "test": "breakpad_unittests" |
| 73 }, | 87 }, |
| 74 { | 88 { |
| 75 "swarming": { | 89 "swarming": { |
| 76 "can_use_on_swarming_builders": true, | 90 "can_use_on_swarming_builders": true, |
| 77 "dimension_sets": [ | 91 "dimension_sets": [ |
| 78 { | 92 { |
| 79 "device_os": "KTU84P", | 93 "device_os": "KTU84P", |
| 80 "device_type": "hammerhead" | 94 "device_type": "hammerhead" |
| 81 } | 95 } |
| 82 ] | 96 ] |
| 83 }, | 97 }, |
| 84 "test": "components_browsertests" | 98 "test": "cc_unittests" |
| 85 }, | 99 }, |
| 86 { | 100 { |
| 87 "swarming": { | 101 "swarming": { |
| 88 "can_use_on_swarming_builders": true, | 102 "can_use_on_swarming_builders": true, |
| 89 "dimension_sets": [ | 103 "dimension_sets": [ |
| 90 { | 104 { |
| 91 "device_os": "KTU84P", | 105 "device_os": "KTU84P", |
| 92 "device_type": "hammerhead" | 106 "device_type": "hammerhead" |
| 93 } | 107 } |
| 94 ] | 108 ], |
| 109 "hard_timeout": 1200 |
| 95 }, | 110 }, |
| 96 "test": "components_unittests" | 111 "test": "chrome_public_test" |
| 97 }, | 112 }, |
| 98 { | 113 { |
| 99 "swarming": { | 114 "swarming": { |
| 100 "can_use_on_swarming_builders": true, | 115 "can_use_on_swarming_builders": true, |
| 101 "dimension_sets": [ | 116 "dimension_sets": [ |
| 102 { | 117 { |
| 103 "device_os": "KTU84P", | 118 "device_os": "KTU84P", |
| 104 "device_type": "hammerhead" | 119 "device_type": "hammerhead" |
| 105 } | 120 } |
| 106 ] | 121 ], |
| 122 "hard_timeout": 960 |
| 107 }, | 123 }, |
| 108 "test": "content_browsertests" | 124 "test": "chrome_sync_shell_test" |
| 109 }, | 125 }, |
| 110 { | 126 { |
| 111 "swarming": { | 127 "swarming": { |
| 112 "can_use_on_swarming_builders": true, | 128 "can_use_on_swarming_builders": true, |
| 113 "dimension_sets": [ | 129 "dimension_sets": [ |
| 114 { | 130 { |
| 115 "device_os": "KTU84P", | 131 "device_os": "KTU84P", |
| 116 "device_type": "hammerhead" | 132 "device_type": "hammerhead" |
| 117 } | 133 } |
| 118 ] | 134 ] |
| 119 }, | 135 }, |
| 120 "test": "content_unittests" | 136 "test": "components_browsertests" |
| 121 }, | 137 }, |
| 122 { | 138 { |
| 123 "swarming": { | 139 "swarming": { |
| 124 "can_use_on_swarming_builders": true, | 140 "can_use_on_swarming_builders": true, |
| 125 "dimension_sets": [ | 141 "dimension_sets": [ |
| 126 { | 142 { |
| 127 "device_os": "KTU84P", | 143 "device_os": "KTU84P", |
| 128 "device_type": "hammerhead" | 144 "device_type": "hammerhead" |
| 129 } | 145 } |
| 130 ] | 146 ] |
| 131 }, | 147 }, |
| 132 "test": "device_unittests" | 148 "test": "components_unittests" |
| 133 }, | 149 }, |
| 134 { | 150 { |
| 135 "swarming": { | 151 "swarming": { |
| 136 "can_use_on_swarming_builders": true, | 152 "can_use_on_swarming_builders": true, |
| 137 "dimension_sets": [ | 153 "dimension_sets": [ |
| 138 { | 154 { |
| 139 "device_os": "KTU84P", | 155 "device_os": "KTU84P", |
| 140 "device_type": "hammerhead" | 156 "device_type": "hammerhead" |
| 141 } | 157 } |
| 142 ] | 158 ], |
| 159 "hard_timeout": 960 |
| 143 }, | 160 }, |
| 144 "test": "events_unittests" | 161 "test": "content_browsertests" |
| 145 }, | 162 }, |
| 146 { | 163 { |
| 147 "swarming": { | 164 "swarming": { |
| 148 "can_use_on_swarming_builders": true, | 165 "can_use_on_swarming_builders": true, |
| 149 "dimension_sets": [ | 166 "dimension_sets": [ |
| 150 { | 167 { |
| 151 "device_os": "KTU84P", | 168 "device_os": "KTU84P", |
| 152 "device_type": "hammerhead" | 169 "device_type": "hammerhead" |
| 153 } | 170 } |
| 154 ] | 171 ], |
| 172 "hard_timeout": 960 |
| 155 }, | 173 }, |
| 156 "test": "gl_tests" | 174 "test": "content_shell_test" |
| 157 }, | 175 }, |
| 158 { | 176 { |
| 159 "swarming": { | 177 "swarming": { |
| 160 "can_use_on_swarming_builders": true, | 178 "can_use_on_swarming_builders": true, |
| 161 "dimension_sets": [ | 179 "dimension_sets": [ |
| 162 { | 180 { |
| 163 "device_os": "KTU84P", | 181 "device_os": "KTU84P", |
| 164 "device_type": "hammerhead" | 182 "device_type": "hammerhead" |
| 165 } | 183 } |
| 166 ] | 184 ] |
| 167 }, | 185 }, |
| 168 "test": "gpu_unittests" | 186 "test": "content_unittests" |
| 169 }, | 187 }, |
| 170 { | 188 { |
| 171 "swarming": { | 189 "swarming": { |
| 172 "can_use_on_swarming_builders": true, | 190 "can_use_on_swarming_builders": true, |
| 173 "dimension_sets": [ | 191 "dimension_sets": [ |
| 174 { | 192 { |
| 175 "device_os": "KTU84P", | 193 "device_os": "KTU84P", |
| 176 "device_type": "hammerhead" | 194 "device_type": "hammerhead" |
| 177 } | 195 } |
| 178 ] | 196 ] |
| 179 }, | 197 }, |
| 180 "test": "ipc_tests" | 198 "test": "device_unittests" |
| 181 }, | 199 }, |
| 182 { | 200 { |
| 183 "swarming": { | 201 "swarming": { |
| 184 "can_use_on_swarming_builders": true, | 202 "can_use_on_swarming_builders": true, |
| 185 "dimension_sets": [ | 203 "dimension_sets": [ |
| 186 { | 204 { |
| 187 "device_os": "KTU84P", | 205 "device_os": "KTU84P", |
| 188 "device_type": "hammerhead" | 206 "device_type": "hammerhead" |
| 189 } | 207 } |
| 190 ] | 208 ] |
| 191 }, | 209 }, |
| 192 "test": "media_unittests" | 210 "test": "events_unittests" |
| 193 }, | 211 }, |
| 194 { | 212 { |
| 195 "swarming": { | 213 "swarming": { |
| 196 "can_use_on_swarming_builders": true, | 214 "can_use_on_swarming_builders": true, |
| 197 "dimension_sets": [ | 215 "dimension_sets": [ |
| 198 { | 216 { |
| 199 "device_os": "KTU84P", | 217 "device_os": "KTU84P", |
| 200 "device_type": "hammerhead" | 218 "device_type": "hammerhead" |
| 201 } | 219 } |
| 202 ] | 220 ] |
| 203 }, | 221 }, |
| 204 "test": "net_unittests" | 222 "test": "gl_tests" |
| 205 }, | 223 }, |
| 206 { | 224 { |
| 207 "swarming": { | 225 "swarming": { |
| 208 "can_use_on_swarming_builders": true, | 226 "can_use_on_swarming_builders": true, |
| 209 "dimension_sets": [ | 227 "dimension_sets": [ |
| 210 { | 228 { |
| 211 "device_os": "KTU84P", | 229 "device_os": "KTU84P", |
| 212 "device_type": "hammerhead" | 230 "device_type": "hammerhead" |
| 213 } | 231 } |
| 214 ] | 232 ] |
| 215 }, | 233 }, |
| 216 "test": "sandbox_linux_unittests" | 234 "test": "gpu_unittests" |
| 217 }, | 235 }, |
| 218 { | 236 { |
| 219 "swarming": { | 237 "swarming": { |
| 220 "can_use_on_swarming_builders": true, | 238 "can_use_on_swarming_builders": true, |
| 221 "dimension_sets": [ | 239 "dimension_sets": [ |
| 222 { | 240 { |
| 223 "device_os": "KTU84P", | 241 "device_os": "KTU84P", |
| 224 "device_type": "hammerhead" | 242 "device_type": "hammerhead" |
| 225 } | 243 } |
| 226 ] | 244 ] |
| 227 }, | 245 }, |
| 228 "test": "sql_unittests" | 246 "test": "ipc_tests" |
| 229 }, | 247 }, |
| 230 { | 248 { |
| 231 "swarming": { | 249 "swarming": { |
| 232 "can_use_on_swarming_builders": true, | 250 "can_use_on_swarming_builders": true, |
| 233 "dimension_sets": [ | 251 "dimension_sets": [ |
| 234 { | 252 { |
| 235 "device_os": "KTU84P", | 253 "device_os": "KTU84P", |
| 236 "device_type": "hammerhead" | 254 "device_type": "hammerhead" |
| 237 } | 255 } |
| 238 ] | 256 ] |
| 239 }, | 257 }, |
| 240 "test": "sync_unit_tests" | 258 "test": "media_unittests" |
| 241 }, | 259 }, |
| 242 { | 260 { |
| 243 "swarming": { | 261 "swarming": { |
| 244 "can_use_on_swarming_builders": true, | 262 "can_use_on_swarming_builders": true, |
| 245 "dimension_sets": [ | 263 "dimension_sets": [ |
| 246 { | 264 { |
| 247 "device_os": "KTU84P", | 265 "device_os": "KTU84P", |
| 248 "device_type": "hammerhead" | 266 "device_type": "hammerhead" |
| 249 } | 267 } |
| 250 ] | 268 ] |
| 251 }, | 269 }, |
| 252 "test": "ui_android_unittests" | 270 "test": "net_unittests" |
| 253 }, | 271 }, |
| 254 { | 272 { |
| 255 "swarming": { | 273 "swarming": { |
| 256 "can_use_on_swarming_builders": true, | 274 "can_use_on_swarming_builders": true, |
| 257 "dimension_sets": [ | 275 "dimension_sets": [ |
| 258 { | 276 { |
| 259 "device_os": "KTU84P", | 277 "device_os": "KTU84P", |
| 260 "device_type": "hammerhead" | 278 "device_type": "hammerhead" |
| 261 } | 279 } |
| 262 ] | 280 ] |
| 263 }, | 281 }, |
| 264 "test": "ui_base_unittests" | 282 "test": "sandbox_linux_unittests" |
| 265 }, | 283 }, |
| 266 { | 284 { |
| 267 "swarming": { | 285 "swarming": { |
| 268 "can_use_on_swarming_builders": true, | 286 "can_use_on_swarming_builders": true, |
| 269 "dimension_sets": [ | 287 "dimension_sets": [ |
| 270 { | 288 { |
| 271 "device_os": "KTU84P", | 289 "device_os": "KTU84P", |
| 272 "device_type": "hammerhead" | 290 "device_type": "hammerhead" |
| 273 } | 291 } |
| 274 ] | 292 ] |
| 275 }, | 293 }, |
| 276 "test": "ui_touch_selection_unittests" | 294 "test": "sql_unittests" |
| 277 }, | 295 }, |
| 278 { | 296 { |
| 279 "swarming": { | 297 "swarming": { |
| 280 "can_use_on_swarming_builders": true, | 298 "can_use_on_swarming_builders": true, |
| 281 "dimension_sets": [ | 299 "dimension_sets": [ |
| 282 { | 300 { |
| 283 "device_os": "KTU84P", | 301 "device_os": "KTU84P", |
| 284 "device_type": "hammerhead" | 302 "device_type": "hammerhead" |
| 285 } | 303 } |
| 286 ] | 304 ] |
| 287 }, | 305 }, |
| 288 "test": "unit_tests" | 306 "test": "sync_unit_tests" |
| 289 } | 307 }, |
| 290 ], | |
| 291 "instrumentation_tests": [ | |
| 292 { | 308 { |
| 293 "apk_under_test": "Blimp.apk", | |
| 294 "override_compile_targets": [ | |
| 295 "blimp_test_apk" | |
| 296 ], | |
| 297 "swarming": { | 309 "swarming": { |
| 298 "can_use_on_swarming_builders": true, | 310 "can_use_on_swarming_builders": true, |
| 299 "dimension_sets": [ | 311 "dimension_sets": [ |
| 300 { | 312 { |
| 301 "device_os": "KTU84P", | 313 "device_os": "KTU84P", |
| 302 "device_type": "hammerhead" | 314 "device_type": "hammerhead" |
| 303 } | 315 } |
| 304 ] | 316 ] |
| 305 }, | 317 }, |
| 306 "test": "blimp_test_apk", | 318 "test": "ui_android_unittests" |
| 307 "test_apk": "BlimpTest.apk" | |
| 308 }, | 319 }, |
| 309 { | 320 { |
| 310 "swarming": { | 321 "swarming": { |
| 311 "can_use_on_swarming_builders": true, | 322 "can_use_on_swarming_builders": true, |
| 312 "dimension_sets": [ | 323 "dimension_sets": [ |
| 313 { | 324 { |
| 314 "device_os": "KTU84P", | 325 "device_os": "KTU84P", |
| 315 "device_type": "hammerhead" | 326 "device_type": "hammerhead" |
| 316 } | 327 } |
| 317 ] | 328 ] |
| 318 }, | 329 }, |
| 319 "test": "chrome_public_test_apk" | 330 "test": "ui_base_unittests" |
| 320 }, | 331 }, |
| 321 { | 332 { |
| 322 "swarming": { | 333 "swarming": { |
| 323 "can_use_on_swarming_builders": true, | 334 "can_use_on_swarming_builders": true, |
| 324 "dimension_sets": [ | 335 "dimension_sets": [ |
| 325 { | 336 { |
| 326 "device_os": "KTU84P", | 337 "device_os": "KTU84P", |
| 327 "device_type": "hammerhead" | 338 "device_type": "hammerhead" |
| 328 } | 339 } |
| 329 ] | 340 ] |
| 330 }, | 341 }, |
| 331 "test": "chrome_sync_shell_test_apk" | 342 "test": "ui_touch_selection_unittests" |
| 332 }, | 343 }, |
| 333 { | 344 { |
| 334 "swarming": { | 345 "swarming": { |
| 335 "can_use_on_swarming_builders": true, | 346 "can_use_on_swarming_builders": true, |
| 336 "dimension_sets": [ | 347 "dimension_sets": [ |
| 337 { | 348 { |
| 338 "device_os": "KTU84P", | 349 "device_os": "KTU84P", |
| 339 "device_type": "hammerhead" | 350 "device_type": "hammerhead" |
| 340 } | 351 } |
| 341 ] | 352 ] |
| 342 }, | 353 }, |
| 343 "test": "content_shell_test_apk" | 354 "test": "unit_tests" |
| 344 } | 355 } |
| 345 ] | 356 ] |
| 346 }, | 357 }, |
| 347 "Jelly Bean Tester": { | 358 "Jelly Bean Tester": { |
| 348 "gtest_tests": [ | 359 "gtest_tests": [ |
| 349 { | 360 { |
| 350 "test": "android_webview_unittests" | 361 "test": "android_webview_unittests" |
| 351 }, | 362 }, |
| 352 { | 363 { |
| 353 "test": "base_unittests" | 364 "test": "base_unittests" |
| (...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 }, | 1184 }, |
| 1174 { | 1185 { |
| 1175 "test": "chrome_sync_shell_test_apk" | 1186 "test": "chrome_sync_shell_test_apk" |
| 1176 }, | 1187 }, |
| 1177 { | 1188 { |
| 1178 "test": "content_shell_test_apk" | 1189 "test": "content_shell_test_apk" |
| 1179 } | 1190 } |
| 1180 ] | 1191 ] |
| 1181 } | 1192 } |
| 1182 } | 1193 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1925673002:
🐾 Reland of Enable instrumentation tests on Android Swarm Builder (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master