| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_memcheck.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_memcheck.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_memcheck.json
|
| index 6ac28b18a9f297e79910010e26c7bfa46910f3cf..21105a019d05d7accde17f7dcec1e6385c3442f2 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_memcheck.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_memcheck.json
|
| @@ -11,13 +11,13 @@
|
| "--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",
|
| "--issue",
|
| "666666",
|
| "--patchset",
|
| @@ -30,7 +30,6 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -67,9 +66,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"
|
| },
|
| {
|
| @@ -81,7 +79,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -91,10 +88,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 fastbuild=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 fastbuild=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"
|
| @@ -114,9 +110,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",
|
| @@ -126,13 +122,12 @@
|
| "--goma-service-account-json-file",
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]/goma",
|
| + "[ROOT]/b/build/goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| "--",
|
| "All"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -165,13 +160,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"
|
| },
|
| {
|
| @@ -197,13 +191,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"
|
| },
|
| {
|
| @@ -229,13 +222,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"
|
| },
|
| {
|
| @@ -261,13 +253,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"
|
| },
|
| {
|
| @@ -293,13 +284,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"
|
| },
|
| {
|
| @@ -325,13 +315,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"
|
| },
|
| {
|
| @@ -357,13 +346,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"
|
| },
|
| {
|
| @@ -389,13 +377,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"
|
| },
|
| {
|
| @@ -421,13 +408,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"
|
| },
|
| {
|
| @@ -453,13 +439,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"
|
| },
|
| {
|
| @@ -485,13 +470,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"
|
| },
|
| {
|
| @@ -517,13 +501,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"
|
| },
|
| {
|
| @@ -549,13 +532,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"
|
| },
|
| {
|
| @@ -581,13 +563,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"
|
| },
|
| {
|
| @@ -613,13 +594,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"
|
| },
|
| {
|
|
|