Index: scripts/slave/recipes/v8/auto_roll_v8_deps.expected/roll.json |
diff --git a/scripts/slave/recipes/v8/auto_roll_v8_deps.expected/roll.json b/scripts/slave/recipes/v8/auto_roll_v8_deps.expected/roll.json |
index bff886739816f2f60cee4cd3048bda9aa7765402..97a2a4301146f4f4acbe91b58a02c48ecdcc99c0 100644 |
--- a/scripts/slave/recipes/v8/auto_roll_v8_deps.expected/roll.json |
+++ b/scripts/slave/recipes/v8/auto_roll_v8_deps.expected/roll.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}, {'custom_deps': {'src/chrome/test/data/pdf_private': None, 'src/native_client': None, 'src/third_party/WebKit': None, 'src/third_party/skia': None, 'src/third_party/webrtc': None, 'src/tools/valgrind': None, 'src/v8': None}, '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'}]\ntarget_os = ['android', 'win']", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}, {'custom_deps': {'src/chrome/test/data/pdf_private': None, 'src/native_client': None, 'src/third_party/WebKit': None, 'src/third_party/skia': None, 'src/third_party/webrtc': None, 'src/tools/valgrind': None, 'src/v8': None}, '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'}]\ntarget_os = ['android', 'win']", |
"--root", |
"v8", |
"--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\", \"v8\": \"got_revision\"}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -26,7 +26,6 @@ |
"--no_shallow", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -109,7 +108,7 @@ |
"-f", |
"origin/master" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git checkout" |
}, |
{ |
@@ -119,7 +118,7 @@ |
"-D", |
"roll" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git branch" |
}, |
{ |
@@ -128,7 +127,7 @@ |
"clean", |
"-ffd" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git clean" |
}, |
{ |
@@ -137,7 +136,7 @@ |
"new-branch", |
"roll" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git new-branch" |
}, |
{ |
@@ -151,7 +150,7 @@ |
"--spec", |
"solutions=[{'managed':False,'name':'src','url':'https://chromium.googlesource.com/chromium/src','deps_file':'DEPS'}]" |
], |
- "cwd": "[SLAVE_BUILD]", |
+ "cwd": "[CWD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -177,7 +176,7 @@ |
"--spec", |
"solutions=[{'managed':False,'name':'v8','url':'https://chromium.googlesource.com/v8/v8','deps_file':'DEPS'}]" |
], |
- "cwd": "[SLAVE_BUILD]", |
+ "cwd": "[CWD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -200,7 +199,7 @@ |
"v8/a/dep", |
"beefdead" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "roll dependency a_dep" |
}, |
{ |
@@ -210,7 +209,7 @@ |
"repo3", |
"HEAD" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "look up another_dep", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -224,7 +223,7 @@ |
"v8/another/dep", |
"deadbeaf" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "roll dependency another_dep" |
}, |
{ |
@@ -234,7 +233,7 @@ |
"v8/odd/dep", |
"weird" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "roll dependency odd_dep", |
"~followup_annotations": [ |
"@@@STEP_WARNINGS@@@" |
@@ -245,7 +244,7 @@ |
"git", |
"diff" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git diff", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -267,7 +266,7 @@ |
"-m", |
"TBR=machenbach@chromium.org,vogelheim@chromium.org,hablich@chromium.org" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git commit", |
"stdout": "/path/to/tmp/" |
}, |
@@ -283,7 +282,7 @@ |
"v8-autoroll@chromium.org", |
"--send-mail" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git cl" |
}, |
{ |