| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg.json
|
| index 9c30782d8f8f1c48031bc934bfb17ef2c7bcfc7c..05ac923eb46bce528123e5a22a579c9b8a466f59 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_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": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "component=shared_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": "component=shared_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"
|
| @@ -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",
|
| "/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": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -161,11 +156,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"
|
| },
|
| {
|
| @@ -187,11 +181,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"
|
| },
|
| {
|
| @@ -213,11 +206,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"
|
| },
|
| {
|
| @@ -239,11 +231,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"
|
| },
|
| {
|
| @@ -265,11 +256,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"
|
| },
|
| {
|
| @@ -291,11 +281,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"
|
| },
|
| {
|
| @@ -317,11 +306,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"
|
| },
|
| {
|
| @@ -343,11 +331,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"
|
| },
|
| {
|
| @@ -369,11 +356,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"
|
| },
|
| {
|
| @@ -395,11 +381,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"
|
| },
|
| {
|
| @@ -421,11 +406,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"
|
| },
|
| {
|
| @@ -447,11 +431,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"
|
| },
|
| {
|
| @@ -473,11 +456,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"
|
| },
|
| {
|
| @@ -499,11 +481,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"
|
| },
|
| {
|
| @@ -528,7 +509,6 @@
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "webrtc_nonparallel_tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|