| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___nosnap.json | 
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___nosnap.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___nosnap.json | 
| index e8805b4357af166613ce86e76dcffc86b720179e..15849db3363c4499922a385d0d5164cc4a510f5b 100644 | 
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___nosnap.json | 
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___nosnap.json | 
| @@ -5,11 +5,10 @@ | 
| "-u", | 
| "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", | 
| "--path", | 
| -      "[SLAVE_BUILD]/swarming.client", | 
| +      "[CWD]/swarming.client", | 
| "--url", | 
| "https://chromium.googlesource.com/external/swarming.client.git" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "git setup (swarming_client)" | 
| }, | 
| { | 
| @@ -20,7 +19,7 @@ | 
| "origin", | 
| "[dummy swarming client hash]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/swarming.client", | 
| +    "cwd": "[CWD]/swarming.client", | 
| "name": "git fetch (swarming_client)" | 
| }, | 
| { | 
| @@ -30,7 +29,7 @@ | 
| "-f", | 
| "FETCH_HEAD" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/swarming.client", | 
| +    "cwd": "[CWD]/swarming.client", | 
| "name": "git checkout (swarming_client)" | 
| }, | 
| { | 
| @@ -39,7 +38,7 @@ | 
| "rev-parse", | 
| "HEAD" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/swarming.client", | 
| +    "cwd": "[CWD]/swarming.client", | 
| "name": "read revision", | 
| "stdout": "/path/to/tmp/", | 
| "~followup_annotations": [ | 
| @@ -54,7 +53,7 @@ | 
| "-d", | 
| "-x" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/swarming.client", | 
| +    "cwd": "[CWD]/swarming.client", | 
| "name": "git clean (swarming_client)" | 
| }, | 
| { | 
| @@ -63,7 +62,7 @@ | 
| "submodule", | 
| "sync" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/swarming.client", | 
| +    "cwd": "[CWD]/swarming.client", | 
| "name": "submodule sync (swarming_client)" | 
| }, | 
| { | 
| @@ -74,7 +73,7 @@ | 
| "--init", | 
| "--recursive" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/swarming.client", | 
| +    "cwd": "[CWD]/swarming.client", | 
| "name": "submodule update (swarming_client)", | 
| "~followup_annotations": [ | 
| "@@@SET_BUILD_PROPERTY@got_revision@\"20123\"@@@" | 
| @@ -84,10 +83,9 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/swarming.client/swarming.py", | 
| +      "[CWD]/swarming.client/swarming.py", | 
| "--version" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "swarming.py --version", | 
| "stdout": "/path/to/tmp/", | 
| "~followup_annotations": [ | 
| @@ -98,7 +96,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/swarming.client/swarming.py", | 
| +      "[CWD]/swarming.client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -173,7 +171,6 @@ | 
| "--json-test-results", | 
| "${ISOLATED_OUTDIR}/output.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] Check on Ubuntu-12.04", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -200,7 +197,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/swarming.client/swarming.py", | 
| +      "[CWD]/swarming.client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -276,7 +273,6 @@ | 
| "--json-test-results", | 
| "${ISOLATED_OUTDIR}/output.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] SimdJs - all on Ubuntu-12.04", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -297,7 +293,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/swarming.client/swarming.py", | 
| +      "[CWD]/swarming.client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -373,7 +369,6 @@ | 
| "--json-test-results", | 
| "${ISOLATED_OUTDIR}/output.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] Test262 - no variants on Ubuntu-12.04", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -394,7 +389,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/swarming.client/swarming.py", | 
| +      "[CWD]/swarming.client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -469,7 +464,6 @@ | 
| "--json-test-results", | 
| "${ISOLATED_OUTDIR}/output.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] Mozilla on Ubuntu-12.04", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -493,9 +487,9 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", | 
| "--swarming-client-dir", | 
| -      "[SLAVE_BUILD]/swarming.client", | 
| +      "[CWD]/swarming.client", | 
| "--temp-root-dir", | 
| -      "[TMP_BASE]", | 
| +      "[TMP]", | 
| "--merged-test-output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -508,7 +502,6 @@ | 
| "2", | 
| "Check/Ubuntu-12.04/[dummy has/V8 Linux - nosnap/571" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "Check", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
| @@ -534,9 +527,9 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", | 
| "--swarming-client-dir", | 
| -      "[SLAVE_BUILD]/swarming.client", | 
| +      "[CWD]/swarming.client", | 
| "--temp-root-dir", | 
| -      "[TMP_BASE]", | 
| +      "[TMP]", | 
| "--merged-test-output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -549,7 +542,6 @@ | 
| "1", | 
| "SimdJs - all/Ubuntu-12.04/[dummy has/V8 Linux - nosnap/571" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "SimdJs - all", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
| @@ -575,9 +567,9 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", | 
| "--swarming-client-dir", | 
| -      "[SLAVE_BUILD]/swarming.client", | 
| +      "[CWD]/swarming.client", | 
| "--temp-root-dir", | 
| -      "[TMP_BASE]", | 
| +      "[TMP]", | 
| "--merged-test-output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -590,7 +582,6 @@ | 
| "1", | 
| "Test262 - no variants/Ubuntu-12.04/[dummy has/V8 Linux - nosnap/571" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "Test262 - no variants", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
| @@ -616,9 +607,9 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", | 
| "--swarming-client-dir", | 
| -      "[SLAVE_BUILD]/swarming.client", | 
| +      "[CWD]/swarming.client", | 
| "--temp-root-dir", | 
| -      "[TMP_BASE]", | 
| +      "[TMP]", | 
| "--merged-test-output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -631,7 +622,6 @@ | 
| "1", | 
| "Mozilla/Ubuntu-12.04/[dummy has/V8 Linux - nosnap/571" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "Mozilla", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", | 
|  |