Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClangLLD64.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang_dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClangLLD64.json |
similarity index 92% |
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang_dbg_.json |
copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClangLLD64.json |
index 7d5a65c70aa41c40d7bec4e1e078c58b825385b7..d536c2c54dea5b0476cc7cca55991bf160946c22 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClang_dbg_.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClangLLD64.json |
@@ -16,7 +16,7 @@ |
"--master", |
"chromium.fyi", |
"--builder", |
- "CrWinClang(dbg)", |
+ "CrWinClangLLD64", |
"--slave", |
"TestSlavename", |
"--spec", |
@@ -93,7 +93,8 @@ |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
- "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 target_arch=ia32 test_isolation_mode=prepare" |
+ "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 target_arch=x64 test_isolation_mode=prepare use_lld=1", |
+ "LLVM_FORCE_HEAD_REVISION": "YES" |
}, |
"name": "gclient runhooks" |
}, |
@@ -110,7 +111,7 @@ |
"~followup_annotations": [ |
"@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"CrWinClang(dbg) tester\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"CrWinClangLLD64 tester\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@", |
@@ -133,11 +134,11 @@ |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
- "Debug", |
+ "Release_x64", |
"--paths", |
"{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}", |
"--properties", |
- "{\"buildername\": \"CrWinClang(dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}" |
+ "{\"buildername\": \"CrWinClangLLD64\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "get compile targets for scripts", |
@@ -161,7 +162,7 @@ |
"-u", |
"RECIPE_MODULE[isolate]\\resources\\find_isolated_tests.py", |
"--build-dir", |
- "[SLAVE_BUILD]\\src\\out\\Debug", |
+ "[SLAVE_BUILD]\\src\\out\\Release_x64", |
"--clean-isolated-files" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -179,6 +180,9 @@ |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "LLVM_FORCE_HEAD_REVISION": "YES" |
+ }, |
"name": "clang_revision", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -193,7 +197,7 @@ |
"-u", |
"[BUILD]\\scripts\\slave\\compile.py", |
"--target", |
- "Debug", |
+ "Release_x64", |
"--src-dir", |
"[SLAVE_BUILD]\\src", |
"--build-tool", |
@@ -203,6 +207,9 @@ |
"--" |
], |
"cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "LLVM_FORCE_HEAD_REVISION": "YES" |
+ }, |
"name": "compile" |
}, |
{ |
@@ -211,7 +218,7 @@ |
"-u", |
"RECIPE_MODULE[isolate]\\resources\\remove_build_metadata.py", |
"--build-dir", |
- "[SLAVE_BUILD]\\src\\out\\Debug", |
+ "[SLAVE_BUILD]\\src\\out\\Release_x64", |
"--src-dir", |
"[SLAVE_BUILD]\\src" |
], |
@@ -230,7 +237,7 @@ |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[SLAVE_BUILD]\\src\\out\\Debug\\browser_tests.isolated.gen.json" |
+ "[SLAVE_BUILD]\\src\\out\\Release_x64\\browser_tests.isolated.gen.json" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
@@ -248,15 +255,15 @@ |
"-u", |
"[BUILD]\\scripts\\slave\\zip_build.py", |
"--target", |
- "Debug", |
+ "Release_x64", |
"--build-url", |
- "gs://chromium-fyi-archive/chromium.fyi/CrWinClang(dbg)", |
+ "gs://chromium-fyi-archive/chromium.fyi/CrWinClangLLD64", |
"--build_revision", |
"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"CrWinClang(dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"CrWinClangLLD64\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"CrWinClang(dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"CrWinClangLLD64\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "package build" |