Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__clang_.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__clang_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__clang_.json |
index 74ed5ded5cfebd895b07e619692f282900747574..0ea12b3524422bc888d0f300608aa6e443a17e35 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__clang_.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__clang_.json |
@@ -1,9 +1,155 @@ |
[ |
{ |
- "cmd": [], |
- "name": "Disabled: see http://crbug.com/595702", |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", |
+ "--master", |
+ "client.webrtc", |
+ "--builder", |
+ "Win64 Debug (Clang)", |
+ "--slave", |
+ "slavename", |
+ "--spec", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]", |
+ "--root", |
+ "src", |
+ "--revision_mapping_file", |
+ "{\"src\": \"got_revision\"}", |
+ "--git-cache-dir", |
+ "[GIT_CACHE]", |
+ "--output_json", |
+ "/path/to/tmp/json", |
+ "--revision", |
+ "src@12345", |
+ "--output_manifest" |
+ ], |
+ "env": { |
+ "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "bot_update", |
"~followup_annotations": [ |
- "@@@STEP_WARNINGS@@@" |
+ "@@@STEP_TEXT@Some step text@@@", |
+ "@@@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\": \"12345\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", |
+ "@@@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@ \"properties\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::webrtc]\\resources\\cleanup_files.py", |
+ "[SLAVE_BUILD]\\src\\out" |
+ ], |
+ "name": "clean test output files" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
+ ], |
+ "name": "cleanup_temp" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", |
+ "runhooks" |
+ ], |
+ "cwd": "[SLAVE_BUILD]\\src", |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
+ "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' rtc_use_h264=1 target_arch=x64 use_goma=1", |
+ "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "gclient runhooks" |
+ }, |
+ { |
+ "allow_subannotations": true, |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py", |
+ "--src-dir", |
+ "[SLAVE_BUILD]\\src", |
+ "--output-json", |
+ "/path/to/tmp/json" |
+ ], |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
+ }, |
+ "name": "clang_revision", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\compile.py", |
+ "--gsutil-py-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py", |
+ "--ninja-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe", |
+ "--target", |
+ "Debug_x64", |
+ "--src-dir", |
+ "[SLAVE_BUILD]\\src", |
+ "--goma-cache-dir", |
+ "[GOMA_CACHE]", |
+ "--build-tool", |
+ "ninja", |
+ "--compiler", |
+ "goma-clang", |
+ "--goma-jsonstatus", |
+ "/path/to/tmp/json", |
+ "--goma-service-account-json-file", |
+ "C:\\creds\\service_accounts\\service-account-goma-client.json", |
+ "--goma-dir", |
+ "[BUILD]\\goma", |
+ "--", |
+ "All" |
+ ], |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
+ }, |
+ "name": "compile", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
+ "@@@STEP_LOG_END@json.output (invalid)@@@" |
] |
}, |
{ |