Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug.json |
index 30f017705ec5d9d53b8ea920c22f840685f6729e..a6f4b890e0c1f5d607333036cc49fbd53c566007 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug.json |
@@ -5,7 +5,6 @@ |
"--json-file", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "host and tools info", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@", |
@@ -34,20 +33,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]" |
}, |
@@ -84,9 +82,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" |
}, |
{ |
@@ -98,7 +95,6 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -108,10 +104,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": "clang=1 component=shared_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "clang=1 component=shared_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" |
@@ -123,11 +118,10 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[SLAVE_BUILD]/src", |
+ "[CWD]/src", |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -154,9 +148,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", |
@@ -166,11 +160,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" |
}, |
@@ -198,11 +191,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" |
}, |
{ |
@@ -223,11 +215,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" |
}, |
{ |
@@ -248,11 +239,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" |
}, |
{ |
@@ -273,11 +263,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" |
}, |
{ |
@@ -298,11 +287,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" |
}, |
{ |
@@ -323,11 +311,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" |
}, |
{ |
@@ -348,11 +335,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" |
}, |
{ |
@@ -373,11 +359,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" |
}, |
{ |
@@ -398,11 +383,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" |
}, |
{ |
@@ -423,11 +407,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" |
}, |
{ |
@@ -448,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/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" |
}, |
{ |
@@ -473,11 +455,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" |
}, |
{ |
@@ -498,11 +479,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" |
}, |
{ |
@@ -523,11 +503,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" |
}, |
{ |
@@ -548,11 +527,10 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Debug/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Debug/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "libjingle_peerconnection_objc_test" |
}, |
{ |
@@ -579,7 +557,6 @@ |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"webrtc_nonparallel_tests" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "webrtc_nonparallel_tests" |
}, |
{ |