Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg_legacy_svn_patch.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg_legacy_svn_patch.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg_legacy_svn_patch.json |
index 8b1cba64ecf8902b13e06426f6701b0aa92ebcdd..ffcd8892da5b21476e6f8726435142401dc6a89d 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg_legacy_svn_patch.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_dbg_legacy_svn_patch.json |
@@ -11,13 +11,13 @@ |
"--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]", |
"--patch_url", |
"try_job_svn_patch", |
"--output_json", |
@@ -26,6 +26,7 @@ |
"src@12345", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -62,8 +63,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" |
}, |
{ |
@@ -75,6 +77,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -84,9 +87,10 @@ |
"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": "component=shared_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", |
+ "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -106,9 +110,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", |
@@ -118,12 +122,13 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[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" |
}, |
@@ -152,10 +157,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/audio_decoder_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/audio_decoder_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "audio_decoder_unittests" |
}, |
{ |
@@ -177,10 +183,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/common_audio_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/common_audio_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "common_audio_unittests" |
}, |
{ |
@@ -202,10 +209,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/common_video_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/common_video_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "common_video_unittests" |
}, |
{ |
@@ -227,10 +235,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/modules_tests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/modules_tests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "modules_tests" |
}, |
{ |
@@ -252,10 +261,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/modules_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/modules_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "modules_unittests" |
}, |
{ |
@@ -277,10 +287,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/peerconnection_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/peerconnection_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "peerconnection_unittests" |
}, |
{ |
@@ -302,10 +313,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/rtc_media_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/rtc_media_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rtc_media_unittests" |
}, |
{ |
@@ -327,10 +339,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/rtc_pc_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/rtc_pc_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rtc_pc_unittests" |
}, |
{ |
@@ -352,10 +365,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/rtc_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/rtc_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rtc_unittests" |
}, |
{ |
@@ -377,10 +391,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/system_wrappers_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/system_wrappers_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "system_wrappers_unittests" |
}, |
{ |
@@ -402,10 +417,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/test_support_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/test_support_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "test_support_unittests" |
}, |
{ |
@@ -427,10 +443,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/tools_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/tools_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "tools_unittests" |
}, |
{ |
@@ -452,10 +469,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/video_engine_tests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/video_engine_tests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "video_engine_tests" |
}, |
{ |
@@ -477,10 +495,11 @@ |
"--build-number=1337", |
"--run-python-script", |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel", |
- "[CWD]/src/out/Debug/voice_engine_unittests", |
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", |
+ "[SLAVE_BUILD]/src/out/Debug/voice_engine_unittests", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "voice_engine_unittests" |
}, |
{ |
@@ -505,6 +524,7 @@ |
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"webrtc_nonparallel_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "webrtc_nonparallel_tests" |
}, |
{ |