Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json |
index 9b02b40175ed364c66fbe77843373afd28dce504..8dfd350800fc59ede581401e72ed3589175bbf98 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json |
@@ -11,20 +11,19 @@ |
"--slave", |
"slavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, '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 = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, '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": "build_for_tool=memcheck 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": "build_for_tool=memcheck 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" |
}, |
@@ -157,13 +152,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"audio_decoder_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "audio_decoder_unittests" |
}, |
{ |
@@ -189,13 +183,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"common_audio_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "common_audio_unittests" |
}, |
{ |
@@ -221,13 +214,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"common_video_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "common_video_unittests" |
}, |
{ |
@@ -253,13 +245,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"modules_tests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "modules_tests" |
}, |
{ |
@@ -285,13 +276,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"modules_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "modules_unittests" |
}, |
{ |
@@ -317,13 +307,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"peerconnection_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "peerconnection_unittests" |
}, |
{ |
@@ -349,13 +338,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"rtc_media_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rtc_media_unittests" |
}, |
{ |
@@ -381,13 +369,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"rtc_pc_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rtc_pc_unittests" |
}, |
{ |
@@ -413,13 +400,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"rtc_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rtc_unittests" |
}, |
{ |
@@ -445,13 +431,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"system_wrappers_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "system_wrappers_unittests" |
}, |
{ |
@@ -477,13 +462,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"test_support_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "test_support_unittests" |
}, |
{ |
@@ -509,13 +493,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"tools_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "tools_unittests" |
}, |
{ |
@@ -541,13 +524,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"video_engine_tests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "video_engine_tests" |
}, |
{ |
@@ -573,13 +555,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"voice_engine_unittests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "voice_engine_unittests" |
}, |
{ |
@@ -605,13 +586,12 @@ |
"--pass-build-dir", |
"--pass-target", |
"--run-shell-script", |
- "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
+ "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh", |
"--test", |
"webrtc_nonparallel_tests", |
"--tool", |
"memcheck" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "webrtc_nonparallel_tests" |
}, |
{ |