Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac_asan.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac_asan.json |
index 9171838c1891438c7e3fdad0b815674c907f00d1..f08fc2a423788104599a711582d8b25cf95dec4b 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac_asan.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac_asan.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": "asan=1 clang=1 component=static_library dcheck_always_on=1 fastbuild=0 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' lsan=1 rtc_use_264=1 target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "asan=1 clang=1 component=static_library dcheck_always_on=1 fastbuild=0 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' lsan=1 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", |
"Release", |
"--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" |
}, |
@@ -199,11 +192,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/audio_decoder_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/audio_decoder_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "audio_decoder_unittests" |
}, |
{ |
@@ -225,11 +217,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/common_audio_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/common_audio_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "common_audio_unittests" |
}, |
{ |
@@ -251,11 +242,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/common_video_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/common_video_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "common_video_unittests" |
}, |
{ |
@@ -277,11 +267,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/modules_tests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/modules_tests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "modules_tests" |
}, |
{ |
@@ -303,11 +292,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/modules_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/modules_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "modules_unittests" |
}, |
{ |
@@ -329,11 +317,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/peerconnection_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/peerconnection_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "peerconnection_unittests" |
}, |
{ |
@@ -355,11 +342,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/rtc_media_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/rtc_media_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rtc_media_unittests" |
}, |
{ |
@@ -381,11 +367,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/rtc_pc_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/rtc_pc_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rtc_pc_unittests" |
}, |
{ |
@@ -407,11 +392,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/rtc_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/rtc_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rtc_unittests" |
}, |
{ |
@@ -433,11 +417,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/system_wrappers_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/system_wrappers_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "system_wrappers_unittests" |
}, |
{ |
@@ -459,11 +442,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/test_support_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/test_support_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "test_support_unittests" |
}, |
{ |
@@ -485,11 +467,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/tools_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/tools_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "tools_unittests" |
}, |
{ |
@@ -511,11 +492,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/video_engine_tests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/video_engine_tests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "video_engine_tests" |
}, |
{ |
@@ -537,11 +517,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/voice_engine_unittests", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/voice_engine_unittests", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "voice_engine_unittests" |
}, |
{ |
@@ -563,11 +542,10 @@ |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--enable-asan", |
- "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[SLAVE_BUILD]/src/out/Release/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test", |
+ "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[CWD]/src/out/Release/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "libjingle_peerconnection_objc_test" |
}, |
{ |
@@ -595,7 +573,6 @@ |
"--enable-asan", |
"webrtc_nonparallel_tests" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "webrtc_nonparallel_tests" |
}, |
{ |