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