Index: scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_Linux_ASan_LSan_Builder.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Full.json b/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_Linux_ASan_LSan_Builder.json |
similarity index 88% |
copy from scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Full.json |
copy to scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_Linux_ASan_LSan_Builder.json |
index 841594b9fc0ccc4e82f0990356616d52a3cbd64e..c824fdb761a33f40af6d06d83a478dfe647ca013 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Full.json |
+++ b/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_Linux_ASan_LSan_Builder.json |
@@ -5,9 +5,9 @@ |
"-u", |
"[BUILD]/scripts/slave/bot_update.py", |
"--master", |
- "chromium.chromiumos", |
+ "tryserver.chromium.linux", |
"--builder", |
- "Linux ChromiumOS Full", |
+ "Linux ASan LSan Builder", |
"--slave", |
"TestSlavename", |
"--spec", |
@@ -66,7 +66,7 @@ |
"runhooks" |
], |
"env": { |
- "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1" |
+ "GYP_DEFINES": "asan=1 clang=1 component=static_library gomadir='[BUILD]/goma' lsan=1 target_arch=x64 use_allocator=none use_goma=1" |
}, |
"name": "gclient runhooks" |
}, |
@@ -75,12 +75,12 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json", |
+ "[SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.linux.json", |
"/path/to/tmp/json" |
], |
"name": "read test spec", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json@@@", |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.linux.json@@@", |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
@@ -105,32 +105,27 @@ |
"--build-tool", |
"ninja", |
"--compiler", |
- "goma", |
+ "goma-clang", |
"--goma-dir", |
"[BUILD]/goma", |
"--", |
- "app_list_unittests", |
- "aura_builder", |
+ "accessibility_unittests", |
"base_unittests", |
- "browser_tests", |
"cacheinvalidation_unittests", |
- "chromeos_unittests", |
+ "cast_unittests", |
+ "cc_unittests", |
"components_unittests", |
- "compositor_unittests", |
- "content_browsertests", |
"content_unittests", |
"crypto_unittests", |
- "dbus_unittests", |
"device_unittests", |
+ "display_unittests", |
"gcm_unit_tests", |
+ "gfx_unittests", |
"google_apis_unittests", |
"gpu_unittests", |
- "interactive_ui_tests", |
"ipc_tests", |
"jingle_unittests", |
"media_unittests", |
- "message_center_unittests", |
- "nacl_loader_unittests", |
"net_unittests", |
"ppapi_unittests", |
"printing_unittests", |
@@ -140,8 +135,7 @@ |
"sync_unit_tests", |
"ui_unittests", |
"unit_tests", |
- "url_unittests", |
- "views_unittests" |
+ "url_unittests" |
], |
"name": "compile" |
}, |
@@ -167,7 +161,7 @@ |
"--target", |
"Release", |
"--factory-properties", |
- "{\"gclient_env\": {\"GYP_DEFINES\": \"chromeos=1 component=static_library ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}", |
+ "{\"gclient_env\": {\"GYP_DEFINES\": \"asan=1 clang=1 component=static_library gomadir='[BUILD]/goma' lsan=1 target_arch=x64 use_allocator=none use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}", |
"--build-properties", |
"{\"got_nacl_revision\": 274981, \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_revision\": 170242, \"got_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_swarming_client_revision\": 276089, \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_v8_revision\": 43426, \"got_v8_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_webkit_revision\": 124383, \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", \"got_webrtc_revision\": 120644, \"got_webrtc_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\"}" |
], |