Index: recipe_modules/tryserver/example.expected/with_git_patch.json |
diff --git a/recipe_modules/tryserver/example.expected/with_git_patch.json b/recipe_modules/tryserver/example.expected/with_git_patch.json |
index 117f1c2e17844e6ba842e4e4258d041af898466d..570d5c2e26722c24bb138118fe23939a1a91a0df 100644 |
--- a/recipe_modules/tryserver/example.expected/with_git_patch.json |
+++ b/recipe_modules/tryserver/example.expected/with_git_patch.json |
@@ -3,13 +3,12 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILD]/scripts/slave/git_setup.py", |
+ "[ROOT]/b/build/scripts/slave/git_setup.py", |
"--path", |
- "[TMP_BASE]/patch_tmp_1", |
+ "[TMP]/patch_tmp_1", |
"--url", |
"http://patch.url/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "patch git setup" |
}, |
{ |
@@ -19,7 +18,7 @@ |
"origin", |
"johndoe#123.diff" |
], |
- "cwd": "[TMP_BASE]/patch_tmp_1", |
+ "cwd": "[TMP]/patch_tmp_1", |
"name": "patch fetch" |
}, |
{ |
@@ -30,7 +29,7 @@ |
"-d", |
"-x" |
], |
- "cwd": "[TMP_BASE]/patch_tmp_1", |
+ "cwd": "[TMP]/patch_tmp_1", |
"name": "patch clean" |
}, |
{ |
@@ -40,32 +39,30 @@ |
"-f", |
"FETCH_HEAD" |
], |
- "cwd": "[TMP_BASE]/patch_tmp_1", |
+ "cwd": "[TMP]/patch_tmp_1", |
"name": "patch git checkout" |
}, |
{ |
"cmd": [ |
"patch", |
"--dir", |
- "[SLAVE_BUILD]", |
+ "[CWD]", |
"--force", |
"--forward", |
"--remove-empty-files", |
"--strip", |
"0", |
"--input", |
- "[TMP_BASE]/patch_tmp_1/patch.diff" |
+ "[TMP]/patch_tmp_1/patch.diff" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "apply patch" |
}, |
{ |
"cmd": [ |
"rm", |
"-rf", |
- "[TMP_BASE]/patch_tmp_1" |
+ "[TMP]/patch_tmp_1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "remove patch" |
}, |
{ |
@@ -75,7 +72,7 @@ |
"--cached", |
"--name-only" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git diff to analyze patch", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -91,7 +88,6 @@ |
"-u", |
"import sys; sys.exit(1)" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "fail", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |