| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_dbg.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_dbg.json
|
| index bb56952bb63cb5c98cb571e8565a4b8bec9c6642..d8617dec596055444176d538cf2239d139766c6c 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_dbg.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_dbg.json
|
| @@ -11,13 +11,13 @@
|
| "--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",
|
| "--issue",
|
| "666666",
|
| "--patchset",
|
| @@ -30,7 +30,6 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -67,9 +66,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"
|
| },
|
| {
|
| @@ -81,7 +79,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -91,10 +88,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=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' rtc_use_264=1 target_arch=ia32 use_goma=1",
|
| + "GYP_DEFINES": "chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]\\b\\build\\goma' rtc_use_264=1 target_arch=ia32 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -114,9 +110,9 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -126,13 +122,12 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[ROOT]\\b\\build\\goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| "--",
|
| "All"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -160,11 +155,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\audio_decoder_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\audio_decoder_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "audio_decoder_unittests"
|
| },
|
| {
|
| @@ -185,11 +179,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\common_audio_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\common_audio_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_audio_unittests"
|
| },
|
| {
|
| @@ -210,11 +203,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\common_video_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\common_video_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_video_unittests"
|
| },
|
| {
|
| @@ -235,11 +227,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\modules_tests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\modules_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_tests"
|
| },
|
| {
|
| @@ -260,11 +251,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\modules_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\modules_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_unittests"
|
| },
|
| {
|
| @@ -285,11 +275,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\peerconnection_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\peerconnection_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "peerconnection_unittests"
|
| },
|
| {
|
| @@ -310,11 +299,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\rtc_media_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\rtc_media_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_media_unittests"
|
| },
|
| {
|
| @@ -335,11 +323,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\rtc_pc_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\rtc_pc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_pc_unittests"
|
| },
|
| {
|
| @@ -360,11 +347,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\rtc_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\rtc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_unittests"
|
| },
|
| {
|
| @@ -385,11 +371,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\system_wrappers_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\system_wrappers_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "system_wrappers_unittests"
|
| },
|
| {
|
| @@ -410,11 +395,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\test_support_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\test_support_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_support_unittests"
|
| },
|
| {
|
| @@ -435,11 +419,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\tools_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\tools_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tools_unittests"
|
| },
|
| {
|
| @@ -460,11 +443,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\video_engine_tests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\video_engine_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "video_engine_tests"
|
| },
|
| {
|
| @@ -485,11 +467,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\voice_engine_unittests",
|
| + "[CWD]\\src\\third_party\\gtest-parallel\\gtest-parallel",
|
| + "[CWD]\\src\\out\\Debug\\voice_engine_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "voice_engine_unittests"
|
| },
|
| {
|
| @@ -513,7 +494,6 @@
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "webrtc_nonparallel_tests.exe"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|