OLD | NEW |
---|---|
1 { | 1 { |
2 "Android Arm64 Builder (dbg)": { | 2 "Android Arm64 Builder (dbg)": { |
3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
4 "gn_all" | 4 "gn_all" |
5 ] | 5 ] |
6 }, | 6 }, |
7 "Android Builder": { | 7 "Android Builder": { |
8 "additional_compile_targets": [ | 8 "additional_compile_targets": [ |
9 "cronet_test_instrumentation_apk", | 9 "cronet_test_instrumentation_apk", |
10 "system_webview_apk" | 10 "system_webview_apk" |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 }, | 203 }, |
204 "Android Tests": { | 204 "Android Tests": { |
205 "gtest_tests": [ | 205 "gtest_tests": [ |
206 { | 206 { |
207 "test": "android_webview_unittests" | 207 "test": "android_webview_unittests" |
208 }, | 208 }, |
209 { | 209 { |
210 "test": "base_unittests" | 210 "test": "base_unittests" |
211 }, | 211 }, |
212 { | 212 { |
213 "test": "blimp_unittests" | |
214 }, | |
215 { | |
213 "test": "blink_heap_unittests" | 216 "test": "blink_heap_unittests" |
214 }, | 217 }, |
215 { | 218 { |
216 "override_compile_targets": [ | 219 "override_compile_targets": [ |
217 "breakpad_unittests_deps" | 220 "breakpad_unittests_deps" |
218 ], | 221 ], |
219 "test": "breakpad_unittests" | 222 "test": "breakpad_unittests" |
220 }, | 223 }, |
221 { | 224 { |
222 "test": "cc_unittests" | 225 "test": "cc_unittests" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 }, | 317 }, |
315 { | 318 { |
316 "test": "unit_tests" | 319 "test": "unit_tests" |
317 } | 320 } |
318 ], | 321 ], |
319 "instrumentation_tests": [ | 322 "instrumentation_tests": [ |
320 { | 323 { |
321 "test": "android_webview_test_apk" | 324 "test": "android_webview_test_apk" |
322 }, | 325 }, |
323 { | 326 { |
327 "apk_under_test": "Blimp.apk", | |
jbudorick
2016/05/18 14:20:44
I don't think apk_under_test or test_apk are neces
jbudorick
2016/05/18 17:25:21
Actually, leave override_compile_targets out. I'm
shenghuazhang
2016/05/18 18:00:46
Done. Just leave "test": "blimp_test_apk" here.
| |
328 "test": "blimp_test_apk", | |
329 "test_apk": "BlimpTest.apk" | |
330 }, | |
331 { | |
324 "test": "chrome_sync_shell_test_apk" | 332 "test": "chrome_sync_shell_test_apk" |
325 }, | 333 }, |
326 { | 334 { |
327 "test": "content_shell_test_apk" | 335 "test": "content_shell_test_apk" |
328 } | 336 } |
329 ], | 337 ], |
330 "junit_tests": [ | 338 "junit_tests": [ |
331 { | 339 { |
332 "test": "base_junit_tests" | 340 "test": "base_junit_tests" |
333 }, | 341 }, |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
369 }, | 377 }, |
370 "Android Tests (dbg)": { | 378 "Android Tests (dbg)": { |
371 "gtest_tests": [ | 379 "gtest_tests": [ |
372 { | 380 { |
373 "test": "android_webview_unittests" | 381 "test": "android_webview_unittests" |
374 }, | 382 }, |
375 { | 383 { |
376 "test": "base_unittests" | 384 "test": "base_unittests" |
377 }, | 385 }, |
378 { | 386 { |
387 "test": "blimp_unittests" | |
388 }, | |
389 { | |
379 "test": "blink_heap_unittests" | 390 "test": "blink_heap_unittests" |
380 }, | 391 }, |
381 { | 392 { |
382 "override_compile_targets": [ | 393 "override_compile_targets": [ |
383 "breakpad_unittests_deps" | 394 "breakpad_unittests_deps" |
384 ], | 395 ], |
385 "test": "breakpad_unittests" | 396 "test": "breakpad_unittests" |
386 }, | 397 }, |
387 { | 398 { |
388 "test": "cc_unittests" | 399 "test": "cc_unittests" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
449 }, | 460 }, |
450 { | 461 { |
451 "test": "unit_tests" | 462 "test": "unit_tests" |
452 } | 463 } |
453 ], | 464 ], |
454 "instrumentation_tests": [ | 465 "instrumentation_tests": [ |
455 { | 466 { |
456 "test": "android_webview_test_apk" | 467 "test": "android_webview_test_apk" |
457 }, | 468 }, |
458 { | 469 { |
470 "apk_under_test": "Blimp.apk", | |
jbudorick
2016/05/18 14:20:44
(same here)
shenghuazhang
2016/05/18 18:00:46
Done.
| |
471 "test": "blimp_test_apk", | |
472 "test_apk": "BlimpTest.apk" | |
473 }, | |
474 { | |
459 "test": "chrome_public_test_apk" | 475 "test": "chrome_public_test_apk" |
460 }, | 476 }, |
461 { | 477 { |
462 "test": "chrome_sync_shell_test_apk" | 478 "test": "chrome_sync_shell_test_apk" |
463 }, | 479 }, |
464 { | 480 { |
465 "test": "content_shell_test_apk" | 481 "test": "content_shell_test_apk" |
466 } | 482 } |
467 ], | 483 ], |
468 "junit_tests": [ | 484 "junit_tests": [ |
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1568 "name": "nacl_integration", | 1584 "name": "nacl_integration", |
1569 "script": "nacl_integration.py" | 1585 "script": "nacl_integration.py" |
1570 } | 1586 } |
1571 ] | 1587 ] |
1572 }, | 1588 }, |
1573 "Linux Tests (dbg)(1)(32)": { | 1589 "Linux Tests (dbg)(1)(32)": { |
1574 "gtest_tests": [], | 1590 "gtest_tests": [], |
1575 "scripts": [] | 1591 "scripts": [] |
1576 } | 1592 } |
1577 } | 1593 } |
OLD | NEW |