Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1544)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/ozone_ecs.expected/basic.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json ('k') | scripts/slave/recipes/ozone_ecs.expected/check_ecs_deps_fail.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/ozone_ecs.expected/basic.json
diff --git a/scripts/slave/recipes/ozone_ecs.expected/basic.json b/scripts/slave/recipes/ozone_ecs.expected/basic.json
index df640771bd91d7302879cc63cc600b925421bcc1..6effa0737e69028bc3a2941eb8341e63c78e409c 100644
--- a/scripts/slave/recipes/ozone_ecs.expected/basic.json
+++ b/scripts/slave/recipes/ozone_ecs.expected/basic.json
@@ -11,20 +11,19 @@
"--slave",
"test_slave",
"--spec",
- "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'}]",
+ "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'}]",
"--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",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@204787",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -103,10 +102,9 @@
"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='[BUILD]/goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "component=shared_library embedded=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -126,9 +124,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",
@@ -138,11 +136,10 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[BUILD]/goma",
+ "[ROOT]/b/build/goma",
"--",
"content_shell"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -156,9 +153,9 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/check_ecs_deps/check_ecs_deps.py"
+ "[CWD]/src/tools/check_ecs_deps/check_ecs_deps.py"
],
- "cwd": "[SLAVE_BUILD]/src/out/Debug",
+ "cwd": "[CWD]/src/out/Debug",
"name": "check ecs deps"
},
{
@@ -176,9 +173,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",
@@ -188,7 +185,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[BUILD]/goma",
+ "[ROOT]/b/build/goma",
"--",
"aura_unittests",
"base_unittests",
@@ -215,7 +212,6 @@
"ui_touch_selection_unittests",
"url_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -244,7 +240,6 @@
"--no-spawn-dbus",
"aura_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "aura_unittests"
},
{
@@ -266,7 +261,6 @@
"--no-spawn-dbus",
"base_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "base_unittests"
},
{
@@ -288,7 +282,6 @@
"--no-spawn-dbus",
"cacheinvalidation_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cacheinvalidation_unittests"
},
{
@@ -310,7 +303,6 @@
"--no-spawn-dbus",
"cc_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cc_unittests"
},
{
@@ -332,7 +324,6 @@
"--no-spawn-dbus",
"components_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "components_unittests"
},
{
@@ -354,7 +345,6 @@
"--no-spawn-dbus",
"compositor_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "compositor_unittests"
},
{
@@ -376,7 +366,6 @@
"--no-spawn-dbus",
"content_browsertests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "content_browsertests"
},
{
@@ -398,7 +387,6 @@
"--no-spawn-dbus",
"content_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "content_unittests"
},
{
@@ -420,7 +408,6 @@
"--no-spawn-dbus",
"crypto_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "crypto_unittests"
},
{
@@ -442,7 +429,6 @@
"--no-spawn-dbus",
"device_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "device_unittests"
},
{
@@ -464,7 +450,6 @@
"--no-spawn-dbus",
"events_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "events_unittests"
},
{
@@ -486,7 +471,6 @@
"--no-spawn-dbus",
"gfx_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gfx_unittests"
},
{
@@ -508,7 +492,6 @@
"--no-spawn-dbus",
"gpu_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gpu_unittests"
},
{
@@ -530,7 +513,6 @@
"--no-spawn-dbus",
"ipc_tests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ipc_tests"
},
{
@@ -552,7 +534,6 @@
"--no-spawn-dbus",
"media_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "media_unittests"
},
{
@@ -574,7 +555,6 @@
"--no-spawn-dbus",
"net_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "net_unittests"
},
{
@@ -596,7 +576,6 @@
"--no-spawn-dbus",
"ozone_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ozone_unittests"
},
{
@@ -618,7 +597,6 @@
"--no-spawn-dbus",
"ppapi_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ppapi_unittests"
},
{
@@ -640,7 +618,6 @@
"--no-spawn-dbus",
"sandbox_linux_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "sandbox_linux_unittests"
},
{
@@ -662,7 +639,6 @@
"--no-spawn-dbus",
"sql_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "sql_unittests"
},
{
@@ -684,7 +660,6 @@
"--no-spawn-dbus",
"sync_unit_tests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "sync_unit_tests"
},
{
@@ -706,7 +681,6 @@
"--no-spawn-dbus",
"ui_base_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ui_base_unittests"
},
{
@@ -728,7 +702,6 @@
"--no-spawn-dbus",
"ui_touch_selection_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ui_touch_selection_unittests"
},
{
@@ -750,7 +723,6 @@
"--no-spawn-dbus",
"url_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "url_unittests"
},
{
« no previous file with comments | « scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json ('k') | scripts/slave/recipes/ozone_ecs.expected/check_ecs_deps_fail.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698