| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_drmemory_light.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_drmemory_light.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_drmemory_light.json
|
| index 7b4b873acc6e84a8a304eb53b38b56d173f75d62..ca36c6b23e37c183bdb600513c6d35ace3349839 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_drmemory_light.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_drmemory_light.json
|
| @@ -11,13 +11,13 @@
|
| "--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",
|
| "--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": "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='[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='[ROOT]\\b\\build\\goma' rtc_use_264=1 target_arch=ia32 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -114,9 +110,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",
|
| @@ -126,13 +122,12 @@
|
| "--goma-service-account-json-file",
|
| "C:\\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": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -164,13 +159,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "audio_decoder_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "audio_decoder_unittests"
|
| },
|
| {
|
| @@ -195,13 +189,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "common_audio_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_audio_unittests"
|
| },
|
| {
|
| @@ -226,13 +219,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "common_video_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_video_unittests"
|
| },
|
| {
|
| @@ -257,13 +249,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "modules_tests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_tests"
|
| },
|
| {
|
| @@ -288,13 +279,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "modules_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_unittests"
|
| },
|
| {
|
| @@ -319,13 +309,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "peerconnection_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "peerconnection_unittests"
|
| },
|
| {
|
| @@ -350,13 +339,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "rtc_media_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "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.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "rtc_pc_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_pc_unittests"
|
| },
|
| {
|
| @@ -412,13 +399,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "rtc_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_unittests"
|
| },
|
| {
|
| @@ -443,13 +429,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "system_wrappers_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "system_wrappers_unittests"
|
| },
|
| {
|
| @@ -474,13 +459,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "test_support_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_support_unittests"
|
| },
|
| {
|
| @@ -505,13 +489,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "tools_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tools_unittests"
|
| },
|
| {
|
| @@ -536,13 +519,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "video_engine_tests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "video_engine_tests"
|
| },
|
| {
|
| @@ -567,13 +549,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "voice_engine_unittests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "voice_engine_unittests"
|
| },
|
| {
|
| @@ -598,13 +579,12 @@
|
| "--pass-build-dir",
|
| "--pass-target",
|
| "--run-shell-script",
|
| - "[SLAVE_BUILD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| + "[CWD]\\src\\tools\\valgrind-webrtc\\webrtc_tests.bat",
|
| "--test",
|
| "webrtc_nonparallel_tests",
|
| "--tool",
|
| "drmemory_light"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|