Index: scripts/slave/recipes/ozone_ecs.expected/trybot.json |
diff --git a/scripts/slave/recipes/ozone_ecs.expected/trybot.json b/scripts/slave/recipes/ozone_ecs.expected/trybot.json |
index 5345624f5992dcffac676f8350462a3547fdfe51..fbfe253dfad36ed1fac8bb2bc54a0142d51e0208 100644 |
--- a/scripts/slave/recipes/ozone_ecs.expected/trybot.json |
+++ b/scripts/slave/recipes/ozone_ecs.expected/trybot.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"test_slave", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--issue", |
"12853011", |
"--patchset", |
@@ -30,6 +30,7 @@ |
"src@HEAD", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -108,9 +109,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 embedded=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "component=shared_library embedded=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -130,9 +132,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", |
@@ -142,12 +144,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", |
"--", |
"content_shell" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -161,9 +164,9 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/tools/check_ecs_deps/check_ecs_deps.py" |
+ "[SLAVE_BUILD]/src/tools/check_ecs_deps/check_ecs_deps.py" |
], |
- "cwd": "[CWD]/src/out/Debug", |
+ "cwd": "[SLAVE_BUILD]/src/out/Debug", |
"name": "check ecs deps" |
}, |
{ |
@@ -181,9 +184,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", |
@@ -193,7 +196,7 @@ |
"--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", |
"--", |
@@ -222,6 +225,7 @@ |
"ui_touch_selection_unittests", |
"url_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -250,6 +254,7 @@ |
"--no-spawn-dbus", |
"aura_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "aura_unittests" |
}, |
{ |
@@ -271,6 +276,7 @@ |
"--no-spawn-dbus", |
"base_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "base_unittests" |
}, |
{ |
@@ -292,6 +298,7 @@ |
"--no-spawn-dbus", |
"cacheinvalidation_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cacheinvalidation_unittests" |
}, |
{ |
@@ -313,6 +320,7 @@ |
"--no-spawn-dbus", |
"cc_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cc_unittests" |
}, |
{ |
@@ -334,6 +342,7 @@ |
"--no-spawn-dbus", |
"components_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "components_unittests" |
}, |
{ |
@@ -355,6 +364,7 @@ |
"--no-spawn-dbus", |
"compositor_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "compositor_unittests" |
}, |
{ |
@@ -376,6 +386,7 @@ |
"--no-spawn-dbus", |
"content_browsertests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "content_browsertests" |
}, |
{ |
@@ -397,6 +408,7 @@ |
"--no-spawn-dbus", |
"content_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "content_unittests" |
}, |
{ |
@@ -418,6 +430,7 @@ |
"--no-spawn-dbus", |
"crypto_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "crypto_unittests" |
}, |
{ |
@@ -439,6 +452,7 @@ |
"--no-spawn-dbus", |
"device_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "device_unittests" |
}, |
{ |
@@ -460,6 +474,7 @@ |
"--no-spawn-dbus", |
"events_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "events_unittests" |
}, |
{ |
@@ -481,6 +496,7 @@ |
"--no-spawn-dbus", |
"gfx_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gfx_unittests" |
}, |
{ |
@@ -502,6 +518,7 @@ |
"--no-spawn-dbus", |
"gpu_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gpu_unittests" |
}, |
{ |
@@ -523,6 +540,7 @@ |
"--no-spawn-dbus", |
"ipc_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ipc_tests" |
}, |
{ |
@@ -544,6 +562,7 @@ |
"--no-spawn-dbus", |
"media_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "media_unittests" |
}, |
{ |
@@ -565,6 +584,7 @@ |
"--no-spawn-dbus", |
"net_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "net_unittests" |
}, |
{ |
@@ -586,6 +606,7 @@ |
"--no-spawn-dbus", |
"ozone_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ozone_unittests" |
}, |
{ |
@@ -607,6 +628,7 @@ |
"--no-spawn-dbus", |
"ppapi_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ppapi_unittests" |
}, |
{ |
@@ -628,6 +650,7 @@ |
"--no-spawn-dbus", |
"sandbox_linux_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "sandbox_linux_unittests" |
}, |
{ |
@@ -649,6 +672,7 @@ |
"--no-spawn-dbus", |
"sql_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "sql_unittests" |
}, |
{ |
@@ -670,6 +694,7 @@ |
"--no-spawn-dbus", |
"sync_unit_tests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "sync_unit_tests" |
}, |
{ |
@@ -691,6 +716,7 @@ |
"--no-spawn-dbus", |
"ui_base_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ui_base_unittests" |
}, |
{ |
@@ -712,6 +738,7 @@ |
"--no-spawn-dbus", |
"ui_touch_selection_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ui_touch_selection_unittests" |
}, |
{ |
@@ -733,6 +760,7 @@ |
"--no-spawn-dbus", |
"url_unittests" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "url_unittests" |
}, |
{ |