Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux32_debug.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux32_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux32_debug.json |
index faeb2c33a724de990481d35d33e3cd3fde2ec9dc..1e977777c192b2d4c723bdf10ef19ece8da51fb1 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux32_debug.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux32_debug.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": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "component=shared_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=ia32 use_goma=1", |
+ "GYP_DEFINES": "component=shared_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=ia32 use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -104,9 +108,9 @@ |
"--target", |
"Debug", |
"--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", |
"/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": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -148,10 +153,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/audio_decoder_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/audio_decoder_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "audio_decoder_unittests" |
}, |
{ |
@@ -173,10 +179,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/common_audio_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/common_audio_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "common_audio_unittests" |
}, |
{ |
@@ -198,10 +205,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/common_video_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/common_video_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "common_video_unittests" |
}, |
{ |
@@ -223,10 +231,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/modules_tests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/modules_tests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "modules_tests" |
}, |
{ |
@@ -248,10 +257,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/modules_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/modules_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "modules_unittests" |
}, |
{ |
@@ -273,10 +283,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/peerconnection_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/peerconnection_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "peerconnection_unittests" |
}, |
{ |
@@ -298,10 +309,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/rtc_media_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/rtc_media_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rtc_media_unittests" |
}, |
{ |
@@ -323,10 +335,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/rtc_pc_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/rtc_pc_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rtc_pc_unittests" |
}, |
{ |
@@ -348,10 +361,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/rtc_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/rtc_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rtc_unittests" |
}, |
{ |
@@ -373,10 +387,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/system_wrappers_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/system_wrappers_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "system_wrappers_unittests" |
}, |
{ |
@@ -398,10 +413,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/test_support_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/test_support_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "test_support_unittests" |
}, |
{ |
@@ -423,10 +439,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/tools_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/tools_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "tools_unittests" |
}, |
{ |
@@ -448,10 +465,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/video_engine_tests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/video_engine_tests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "video_engine_tests" |
}, |
{ |
@@ -473,10 +491,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/voice_engine_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/voice_engine_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "voice_engine_unittests" |
}, |
{ |
@@ -504,6 +523,7 @@ |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"webrtc_nonparallel_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "webrtc_nonparallel_tests" |
}, |
{ |