| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug.json
|
| index 7cbd0191c3479568e05d020a397282a69f6e60a6..9199ff7703645846c9e93b6d12be34f83f17464b 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug.json
|
| @@ -11,20 +11,19 @@
|
| "--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'}]",
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\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]",
|
| + "[ROOT]\\b\\build\\slave\\cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -61,9 +60,8 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]\\resources\\cleanup_files.py",
|
| - "[SLAVE_BUILD]\\src\\out"
|
| + "[CWD]\\src\\out"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean test output files"
|
| },
|
| {
|
| @@ -75,7 +73,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -85,10 +82,9 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| - "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' rtc_use_264=1 target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]\\b\\build\\goma' rtc_use_264=1 target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -108,9 +104,9 @@
|
| "--target",
|
| "Debug_x64",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -120,11 +116,10 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[ROOT]\\b\\build\\goma",
|
| "--",
|
| "All"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -152,11 +147,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\audio_decoder_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\audio_decoder_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "audio_decoder_unittests"
|
| },
|
| {
|
| @@ -177,11 +171,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\common_audio_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\common_audio_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_audio_unittests"
|
| },
|
| {
|
| @@ -202,11 +195,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\common_video_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\common_video_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_video_unittests"
|
| },
|
| {
|
| @@ -227,11 +219,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\modules_tests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\modules_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_tests"
|
| },
|
| {
|
| @@ -252,11 +243,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\modules_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\modules_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_unittests"
|
| },
|
| {
|
| @@ -277,11 +267,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\peerconnection_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\peerconnection_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "peerconnection_unittests"
|
| },
|
| {
|
| @@ -302,11 +291,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\rtc_media_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\rtc_media_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_media_unittests"
|
| },
|
| {
|
| @@ -327,11 +315,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\rtc_pc_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\rtc_pc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_pc_unittests"
|
| },
|
| {
|
| @@ -352,11 +339,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\rtc_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\rtc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_unittests"
|
| },
|
| {
|
| @@ -377,11 +363,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\system_wrappers_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\system_wrappers_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "system_wrappers_unittests"
|
| },
|
| {
|
| @@ -402,11 +387,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\test_support_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\test_support_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_support_unittests"
|
| },
|
| {
|
| @@ -427,11 +411,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\tools_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\tools_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tools_unittests"
|
| },
|
| {
|
| @@ -452,11 +435,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\video_engine_tests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\video_engine_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "video_engine_tests"
|
| },
|
| {
|
| @@ -477,11 +459,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug_x64\\voice_engine_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug_x64\\voice_engine_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "voice_engine_unittests"
|
| },
|
| {
|
| @@ -508,7 +489,6 @@
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "webrtc_nonparallel_tests.exe"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|