| Index: scripts/slave/recipes/chromium_trybot.expected/clobber_analyze.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/clobber_analyze.json b/scripts/slave/recipes/chromium_trybot.expected/clobber_analyze.json
|
| index 641d2f3003caf81fc59948ca79185c2f7b26956a..1ecdb699e44785d0bd19d02e4198217e619bc63b 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/clobber_analyze.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/clobber_analyze.json
|
| @@ -111,7 +111,8 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
|
| + "GYP_CHROMIUM_NO_ACTION": "1",
|
| + "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| },
|
| "name": "gclient runhooks (with patch)"
|
| @@ -143,13 +144,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -200,15 +201,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/gyp_chromium",
|
| - "--analyzer",
|
| - "{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": []}",
|
| + "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "analyze",
|
| + "-m",
|
| + "tryserver.chromium.linux",
|
| + "-b",
|
| + "linux_chromium_clobber_rel_ng",
|
| + "-v",
|
| + "//out/Release",
|
| + "{\"additional_compile_targets\": [], \"files\": [\"foo.cc\"], \"test_targets\": []}",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
|
| - },
|
| "name": "analyze",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -221,9 +225,7 @@
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@{@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"net_unittests\"@@@",
|
| @@ -251,6 +253,25 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "gen",
|
| + "-m",
|
| + "tryserver.chromium.linux",
|
| + "-b",
|
| + "linux_chromium_clobber_rel_ng",
|
| + "--config-file",
|
| + "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "--goma-dir",
|
| + "[BUILD]/goma",
|
| + "//out/Release"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "generate_build_files (with patch)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "[BUILD]/scripts/slave/compile.py",
|
| "--target",
|
| "Release",
|
|
|