| OLD | NEW |
|---|
| 1 { | 1 { |
| 2 "Mac GYP": { | 2 "Mac GYP": { |
| 3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
| 4 "base_unittests", | 4 "base_unittests", |
| 5 "browser_tests", | 5 "browser_tests", |
| 6 "chrome", | 6 "chrome", |
| 7 "content_browsertests", | 7 "content_browsertests", |
| 8 "content_unittests", | 8 "content_unittests", |
| 9 "interactive_ui_tests", | 9 "interactive_ui_tests", |
| 10 "ipc_tests", | 10 "ipc_tests", |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 { | 360 { |
| 361 "isolate_name": "telemetry_unittests", | 361 "isolate_name": "telemetry_unittests", |
| 362 "name": "telemetry_unittests", | 362 "name": "telemetry_unittests", |
| 363 "override_compile_targets": [ | 363 "override_compile_targets": [ |
| 364 "telemetry_unittests_run" | 364 "telemetry_unittests_run" |
| 365 ], | 365 ], |
| 366 "swarming": { | 366 "swarming": { |
| 367 "can_use_on_swarming_builders": true | 367 "can_use_on_swarming_builders": true |
| 368 } | 368 } |
| 369 } | 369 } |
| 370 ], | |
| 371 "scripts": [ | |
| 372 { | |
| 373 "name": "nacl_integration", | |
| 374 "script": "nacl_integration.py" | |
| 375 } | |
| 376 ] | 370 ] |
| 377 }, | 371 }, |
| 378 "Mac10.11 Tests": { | 372 "Mac10.11 Tests": { |
| 379 "gtest_tests": [ | 373 "gtest_tests": [ |
| 380 { | 374 { |
| 381 "swarming": { | 375 "swarming": { |
| 382 "can_use_on_swarming_builders": true | 376 "can_use_on_swarming_builders": true |
| 383 }, | 377 }, |
| 384 "test": "accessibility_unittests" | 378 "test": "accessibility_unittests" |
| 385 }, | 379 }, |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 711 { | 705 { |
| 712 "isolate_name": "telemetry_unittests", | 706 "isolate_name": "telemetry_unittests", |
| 713 "name": "telemetry_unittests", | 707 "name": "telemetry_unittests", |
| 714 "override_compile_targets": [ | 708 "override_compile_targets": [ |
| 715 "telemetry_unittests_run" | 709 "telemetry_unittests_run" |
| 716 ], | 710 ], |
| 717 "swarming": { | 711 "swarming": { |
| 718 "can_use_on_swarming_builders": true | 712 "can_use_on_swarming_builders": true |
| 719 } | 713 } |
| 720 } | 714 } |
| 721 ], | |
| 722 "scripts": [ | |
| 723 { | |
| 724 "name": "nacl_integration", | |
| 725 "script": "nacl_integration.py" | |
| 726 } | |
| 727 ] | 715 ] |
| 728 }, | 716 }, |
| 729 "Mac10.9 Tests": { | 717 "Mac10.9 Tests": { |
| 730 "gtest_tests": [ | 718 "gtest_tests": [ |
| 731 { | 719 { |
| 732 "swarming": { | 720 "swarming": { |
| 733 "can_use_on_swarming_builders": true | 721 "can_use_on_swarming_builders": true |
| 734 }, | 722 }, |
| 735 "test": "accessibility_unittests" | 723 "test": "accessibility_unittests" |
| 736 }, | 724 }, |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1051 { | 1039 { |
| 1052 "isolate_name": "telemetry_unittests", | 1040 "isolate_name": "telemetry_unittests", |
| 1053 "name": "telemetry_unittests", | 1041 "name": "telemetry_unittests", |
| 1054 "override_compile_targets": [ | 1042 "override_compile_targets": [ |
| 1055 "telemetry_unittests_run" | 1043 "telemetry_unittests_run" |
| 1056 ], | 1044 ], |
| 1057 "swarming": { | 1045 "swarming": { |
| 1058 "can_use_on_swarming_builders": true | 1046 "can_use_on_swarming_builders": true |
| 1059 } | 1047 } |
| 1060 } | 1048 } |
| 1061 ], | |
| 1062 "scripts": [ | |
| 1063 { | |
| 1064 "name": "nacl_integration", | |
| 1065 "script": "nacl_integration.py" | |
| 1066 } | |
| 1067 ] | 1049 ] |
| 1068 }, | 1050 }, |
| 1069 "Mac10.9 Tests (dbg)": { | 1051 "Mac10.9 Tests (dbg)": { |
| 1070 "gtest_tests": [ | 1052 "gtest_tests": [ |
| 1071 { | 1053 { |
| 1072 "swarming": { | 1054 "swarming": { |
| 1073 "can_use_on_swarming_builders": true | 1055 "can_use_on_swarming_builders": true |
| 1074 }, | 1056 }, |
| 1075 "test": "accessibility_unittests" | 1057 "test": "accessibility_unittests" |
| 1076 }, | 1058 }, |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1391 { | 1373 { |
| 1392 "isolate_name": "telemetry_unittests", | 1374 "isolate_name": "telemetry_unittests", |
| 1393 "name": "telemetry_unittests", | 1375 "name": "telemetry_unittests", |
| 1394 "override_compile_targets": [ | 1376 "override_compile_targets": [ |
| 1395 "telemetry_unittests_run" | 1377 "telemetry_unittests_run" |
| 1396 ], | 1378 ], |
| 1397 "swarming": { | 1379 "swarming": { |
| 1398 "can_use_on_swarming_builders": true | 1380 "can_use_on_swarming_builders": true |
| 1399 } | 1381 } |
| 1400 } | 1382 } |
| 1401 ], | |
| 1402 "scripts": [ | |
| 1403 { | |
| 1404 "name": "nacl_integration", | |
| 1405 "script": "nacl_integration.py" | |
| 1406 } | |
| 1407 ] | 1383 ] |
| 1408 } | 1384 } |
| 1409 } | 1385 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2448563002:
Don't run nacl_integration tests on mac. (Closed)
