Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_dbg.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_dbg.json |
index 9cd67fdcf7572db77d19830324216206f4eeb05b..96f72ef2b158849e2224fc1e53cdc9f9e87dfe3d 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_dbg.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_dbg.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]", |
"--issue", |
"666666", |
"--patchset", |
@@ -30,6 +30,7 @@ |
"src@12345", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -66,8 +67,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" |
}, |
{ |
@@ -79,6 +81,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -88,10 +91,11 @@ |
"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_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "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=x64 use_goma=1", |
+ "GYP_DEFINES": "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=x64 use_goma=1", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -100,12 +104,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]\\b\\depot_tools\\gn.py", |
- "--root=[CWD]\\src", |
+ "[DEPOT_TOOLS]\\gn.py", |
+ "--root=[SLAVE_BUILD]\\src", |
"gen", |
"//out/Debug_x64", |
- "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[ROOT]\\b\\build\\goma\"" |
+ "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]\\goma\"" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gn" |
}, |
{ |
@@ -123,9 +128,9 @@ |
"--target", |
"Debug_x64", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -135,12 +140,13 @@ |
"--goma-service-account-json-file", |
"C:\\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": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |