| Index: scripts/slave/recipes/chromium_gn.expected/full_tryserver_chromium_linux_android_chromium_gn_compile_dbg.json
|
| diff --git a/scripts/slave/recipes/chromium_gn.expected/full_tryserver_chromium_linux_android_chromium_gn_compile_dbg.json b/scripts/slave/recipes/chromium_gn.expected/full_tryserver_chromium_linux_android_chromium_gn_compile_dbg.json
|
| index 1a07e8d9d2cbba5806b87d28c8d8e8b22270aa96..c8d9ea1345e077de19d60ad90385a38ac714a6fa 100644
|
| --- a/scripts/slave/recipes/chromium_gn.expected/full_tryserver_chromium_linux_android_chromium_gn_compile_dbg.json
|
| +++ b/scripts/slave/recipes/chromium_gn.expected/full_tryserver_chromium_linux_android_chromium_gn_compile_dbg.json
|
| @@ -115,9 +115,7 @@
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"android_chromium_gn_compile_dbg\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": []@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| @@ -198,75 +196,28 @@
|
| "android_chromium_gn_compile_dbg",
|
| "-v",
|
| "//out/Debug",
|
| - "{\"files\": [\"foo.cc\"], \"targets\": [\"base_unittests_apk\", \"chrome_shell_apk\"]}",
|
| + "{\"files\": [\"foo.cc\"], \"targets\": [\"chrome_shell_apk\"]}",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "analyze",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"targets\": []@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@{@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"original_compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_apk\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"original_compile_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"original_exes\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_apk\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"chrome_shell_apk\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.matching_exes\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ]@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.matching_exes\": []@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@}@@@",
|
| "@@@STEP_LOG_END@analyze_details@@@"
|
| ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| - "--target",
|
| - "Debug",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--goma-disable-local-fallback",
|
| - "--",
|
| - "base_unittests"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "compile"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gn.py",
|
| - "--root=[SLAVE_BUILD]/src",
|
| - "check",
|
| - "//out/Debug"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "gn check"
|
| }
|
| ]
|
|
|