Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_clobber_rel_ng.json |
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_clobber_rel_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_clobber_rel_ng.json |
index bb551080b2eb0b360670bfe17f15c0a964288ca1..2f77309a70aefea0805be46e1246aae6cb47864b 100644 |
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_clobber_rel_ng.json |
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_clobber_rel_ng.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@@@" |
] |
@@ -207,15 +208,9 @@ |
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@", |
"@@@STEP_LOG_END@excluded_files@@@", |
"@@@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@ \"compile_targets\": [@@@", |
- "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\"@@@", |
- "@@@STEP_LOG_LINE@analyze_details@ ], @@@", |
- "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.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@ \"self.m.filter.compile_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@", |
"@@@STEP_LOG_LINE@analyze_details@}@@@", |
@@ -226,46 +221,6 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILD]/scripts/slave/cleanup_temp.py" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "cleanup_temp" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/compile.py", |
- "--target", |
- "Release", |
- "--src-dir", |
- "[SLAVE_BUILD]/src", |
- "--build-tool", |
- "ninja", |
- "--compiler", |
- "goma", |
- "--goma-jsonstatus", |
- "/path/to/tmp/json", |
- "--goma-dir", |
- "[BUILD]/goma", |
- "--goma-fail-fast", |
- "--goma-disable-local-fallback", |
- "--ninja-ensure-up-to-date", |
- "--clobber", |
- "--", |
- "chromium_builder_tests" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "compile (with patch)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
- "@@@STEP_LOG_END@json.output (invalid)@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"import sys; sys.exit(0)" |
], |
"cwd": "[SLAVE_BUILD]", |