| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win_drmemory_full.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win_drmemory_full.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win_drmemory_full.json
|
| index 98f910d1dc446f3d626f26c78a97838246dd4a83..40e8026c8835b1a3a7b3c16db2b67328a0a06496 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win_drmemory_full.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win_drmemory_full.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": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| - "GYP_DEFINES": "build_for_tool=drmemory chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]\\b\\build\\goma' rtc_use_264=1 target_arch=ia32 use_goma=1",
|
| + "GYP_DEFINES": "build_for_tool=drmemory chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=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",
|
| "C:\\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": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -151,12 +156,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "audio_decoder_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "audio_decoder_unittests"
|
| },
|
| {
|
| @@ -181,12 +187,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "common_audio_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "common_audio_unittests"
|
| },
|
| {
|
| @@ -211,12 +218,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "common_video_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "common_video_unittests"
|
| },
|
| {
|
| @@ -241,12 +249,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "modules_tests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_tests"
|
| },
|
| {
|
| @@ -271,12 +280,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "modules_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_unittests"
|
| },
|
| {
|
| @@ -301,12 +311,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "peerconnection_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "peerconnection_unittests"
|
| },
|
| {
|
| @@ -331,12 +342,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "rtc_media_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_media_unittests"
|
| },
|
| {
|
| @@ -361,12 +373,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "rtc_pc_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_pc_unittests"
|
| },
|
| {
|
| @@ -391,12 +404,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "rtc_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_unittests"
|
| },
|
| {
|
| @@ -421,12 +435,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "system_wrappers_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "system_wrappers_unittests"
|
| },
|
| {
|
| @@ -451,12 +466,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "test_support_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "test_support_unittests"
|
| },
|
| {
|
| @@ -481,12 +497,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "tools_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "tools_unittests"
|
| },
|
| {
|
| @@ -511,12 +528,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "video_engine_tests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "video_engine_tests"
|
| },
|
| {
|
| @@ -541,12 +559,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "voice_engine_unittests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "voice_engine_unittests"
|
| },
|
| {
|
| @@ -571,12 +590,13 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "webrtc_nonparallel_tests",
|
| "--tool",
|
| "drmemory_full"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|