Chromium Code Reviews| Index: scripts/slave/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot.json |
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/analyze_runs_nothing_with_no_source_file_changes.json b/scripts/slave/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot.json |
| similarity index 96% |
| copy from scripts/slave/recipes/chromium_trybot.expected/analyze_runs_nothing_with_no_source_file_changes.json |
| copy to scripts/slave/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot.json |
| index e4b878926d6e0921d9439b88c118f6a6b9880fa2..15cc3763a042db4cb886bf749ed9aa9939ca6f2a 100644 |
| --- a/scripts/slave/recipes/chromium_trybot.expected/analyze_runs_nothing_with_no_source_file_changes.json |
| +++ b/scripts/slave/recipes/chromium_trybot.expected/use_webrtc_patch_on_chromium_trybot.json |
| @@ -21,7 +21,7 @@ |
| "--spec", |
| "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
| "--root", |
| - "src", |
| + "src\\third_party", |
|
tandrii(chromium)
2016/05/16 08:28:05
good
|
| "--revision_mapping_file", |
| "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
| "--git-cache-dir", |
| @@ -36,6 +36,8 @@ |
| "/path/to/tmp/json", |
| "--revision", |
| "src@HEAD", |
| + "--revision", |
| + "src/third_party@HEAD", |
|
tandrii(chromium)
2016/05/16 08:28:05
bad :(
kjellander_chromium
2016/05/16 08:34:39
Ah, addressed in https://codereview.chromium.org/1
|
| "--output_manifest" |
| ], |
| "env": { |
| @@ -47,7 +49,8 @@ |
| "@@@STEP_LOG_LINE@json.output@{@@@", |
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", |
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"src/third_party\": \"HEAD\"@@@", |
| "@@@STEP_LOG_LINE@json.output@ }, @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", |
| "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", |
| @@ -80,7 +83,7 @@ |
| "@@@STEP_LOG_LINE@json.output@ }@@@", |
| "@@@STEP_LOG_LINE@json.output@ }, @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", |
| - "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\\\\third_party\", @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", |
| "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@", |
| @@ -266,12 +269,11 @@ |
| "--cached", |
| "--name-only" |
| ], |
| - "cwd": "[SLAVE_BUILD]\\src", |
| + "cwd": "[SLAVE_BUILD]\\src\\third_party", |
| "name": "git diff to analyze patch", |
| "stdout": "/path/to/tmp/", |
| "~followup_annotations": [ |
| - "@@@STEP_LOG_LINE@files@README.md@@@", |
| - "@@@STEP_LOG_LINE@files@foo/bar/baz.py@@@", |
| + "@@@STEP_LOG_LINE@files@third_party/foo.cc@@@", |
| "@@@STEP_LOG_END@files@@@", |
| "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@" |
| ] |
| @@ -313,7 +315,7 @@ |
| "win_chromium_rel_ng", |
| "-v", |
| "//out/Release", |
| - "{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"README.md\", \"foo/bar/baz.py\"], \"test_targets\": [\"mini_installer\"]}", |
| + "{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"third_party/foo.cc\"], \"test_targets\": [\"mini_installer\"]}", |
| "/path/to/tmp/json" |
| ], |
| "env": { |
| @@ -324,7 +326,7 @@ |
| "@@@STEP_TEXT@No compile necessary@@@", |
| "@@@STEP_LOG_LINE@json.output@{@@@", |
| "@@@STEP_LOG_LINE@json.output@ \"compile_targets\": [], @@@", |
| - "@@@STEP_LOG_LINE@json.output@ \"status\": \"No dependencies\", @@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"No dependency\", @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"test_targets\": []@@@", |
| "@@@STEP_LOG_LINE@json.output@}@@@", |
| "@@@STEP_LOG_END@json.output@@@", |