| Index: recipe_modules/git/example.expected/rebase_failed.json
|
| diff --git a/recipe_modules/git/example.expected/rebase_failed.json b/recipe_modules/git/example.expected/rebase_failed.json
|
| index 6abe46464298fc9a210e003f224fe29f8743c6ce..39666c74dd39e98627177b74f54366a0ac99948b 100644
|
| --- a/recipe_modules/git/example.expected/rebase_failed.json
|
| +++ b/recipe_modules/git/example.expected/rebase_failed.json
|
| @@ -5,10 +5,11 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
|
| "--path",
|
| - "[CWD]/src",
|
| + "[SLAVE_BUILD]/src",
|
| "--url",
|
| "https://chromium.googlesource.com/chromium/src.git"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "git setup"
|
| },
|
| {
|
| @@ -20,7 +21,7 @@
|
| "master",
|
| "--recurse-submodules"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -30,7 +31,7 @@
|
| "-f",
|
| "FETCH_HEAD"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git checkout"
|
| },
|
| {
|
| @@ -39,7 +40,7 @@
|
| "rev-parse",
|
| "HEAD"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "read revision",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -54,7 +55,7 @@
|
| "-d",
|
| "-x"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -63,7 +64,7 @@
|
| "submodule",
|
| "sync"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "submodule sync"
|
| },
|
| {
|
| @@ -74,7 +75,7 @@
|
| "--init",
|
| "--recursive"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "submodule update"
|
| },
|
| {
|
| @@ -85,7 +86,7 @@
|
| "count-objects",
|
| "-v"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "count-objects",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -96,7 +97,7 @@
|
| "--get",
|
| "remote.origin.url"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git config remote.origin.url",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -111,7 +112,7 @@
|
| "--format=%at",
|
| "-s"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git show",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -122,7 +123,7 @@
|
| "origin",
|
| "--tags"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git fetch tags"
|
| },
|
| {
|
| @@ -130,7 +131,7 @@
|
| "git",
|
| "status"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git status"
|
| },
|
| {
|
| @@ -138,7 +139,7 @@
|
| "git",
|
| "status"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git status can_fail_build"
|
| },
|
| {
|
| @@ -146,7 +147,7 @@
|
| "git",
|
| "status"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git status cannot_fail_build"
|
| },
|
| {
|
| @@ -155,7 +156,7 @@
|
| "rebase",
|
| "origin/master"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "my repo rebase",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| @@ -168,7 +169,7 @@
|
| "rebase",
|
| "--abort"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "my repo rebase abort"
|
| },
|
| {
|
|
|