| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__large_tests_.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__large_tests_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__large_tests_.json
|
| index b79808b8ee1fb1d19b82731e718212715833654b..2c04456a5ba8a3a2b87617004632abb6117e8816 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__large_tests_.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__large_tests_.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": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "component=static_library dcheck_always_on=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",
|
| "Release",
|
| "--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",
|
| "/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": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -140,7 +135,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]/resources/ensure_webcam_is_running.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webcam_check"
|
| },
|
| {
|
| @@ -175,9 +169,8 @@
|
| "--fixed_digital",
|
| "--perf",
|
| "-pb",
|
| - "[SLAVE_BUILD]/src/resources/audioproc.aecdump"
|
| + "[CWD]/src/resources/audioproc.aecdump"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "audioproc"
|
| },
|
| {
|
| @@ -207,10 +200,9 @@
|
| "--revision=170242",
|
| "isac_fix_test",
|
| "32000",
|
| - "[SLAVE_BUILD]/src/resources/speech_and_misc_wb.pcm",
|
| + "[CWD]/src/resources/speech_and_misc_wb.pcm",
|
| "isac_speech_and_misc_wb.pcm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isac_fix_test"
|
| },
|
| {
|
| @@ -239,7 +231,6 @@
|
| "voe_auto_test",
|
| "--automated"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "voe_auto_test"
|
| },
|
| {
|
| @@ -267,7 +258,6 @@
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "video_capture_tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "video_capture_tests"
|
| },
|
| {
|
| @@ -297,7 +287,6 @@
|
| "--revision=170242",
|
| "webrtc_perf_tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_perf_tests"
|
| },
|
| {
|
|
|