Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/swarming/example.expected/basic_0.5.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[CWD]/swarming.client",
+      "[SLAVE_BUILD]/swarming.client",
       "--url",
       "https://chromium.googlesource.com/external/swarming.client.git"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "git setup (swarming_client)"
   },
   {
     "cmd": [
       "git",
       "retry",
       "fetch",
       "origin",
       "master"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "git fetch (swarming_client)"
   },
   {
     "cmd": [
       "git",
       "checkout",
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "git checkout (swarming_client)"
   },
   {
     "cmd": [
       "git",
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "clean",
       "-f",
       "-d",
       "-x"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "git clean (swarming_client)"
   },
   {
     "cmd": [
       "git",
       "submodule",
       "sync"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "submodule sync (swarming_client)"
   },
   {
     "cmd": [
       "git",
       "submodule",
       "update",
       "--init",
       "--recursive"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "submodule update (swarming_client)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "--version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_TEXT@0.5@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/isolate.py",
+      "[SLAVE_BUILD]/swarming.client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/swarming.client/example/payload/hello_world.isolate",
+      "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate",
       "--isolated",
-      "[TMP]/hello_isolated_world_tmp_1/hello_world.isolated",
+      "[TMP_BASE]/hello_isolated_world_tmp_1/hello_world.isolated",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
       "--config-variable",
       "OS",
       "win",
       "--verbose"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for win",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/isolate.py",
+      "[SLAVE_BUILD]/swarming.client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/swarming.client/example/payload/hello_world.isolate",
+      "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate",
       "--isolated",
-      "[TMP]/hello_isolated_world_tmp_1/hello_world.isolated",
+      "[TMP_BASE]/hello_isolated_world_tmp_1/hello_world.isolated",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
       "--config-variable",
       "OS",
       "linux",
       "--verbose"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for linux",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/isolate.py",
+      "[SLAVE_BUILD]/swarming.client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/swarming.client/example/payload/hello_world.isolate",
+      "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate",
       "--isolated",
-      "[TMP]/hello_isolated_world_tmp_1/hello_world.isolated",
+      "[TMP_BASE]/hello_isolated_world_tmp_1/hello_world.isolated",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
       "--config-variable",
       "OS",
       "mac",
       "--verbose"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for mac",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
       "--priority",
       "30",
       "--shards",
       "1",
       "--task-name",
@@ skipping 31 matching lines @@
       "--tag",
       "rietveld:https://codereview.chromium.org/123/#ps1001",
       "--tag",
       "stepname:hello_world on Windows-7-SP1",
       "--verbose",
       "--idempotent",
       "--user",
       "joe",
       "hash_for_win"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] hello_world on Windows-7-SP1",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hello_world/Windows-7-SP1/hash_for_w\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Windows-7-SP1/hash_for_w\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm-dev.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
       "--priority",
       "30",
       "--shards",
       "2",
       "--task-name",
@@ skipping 31 matching lines @@
       "--tag",
       "rietveld:https://codereview.chromium.org/123/#ps1001",
       "--tag",
       "stepname:hello_world on Ubuntu-12.04",
       "--verbose",
       "--idempotent",
       "--user",
       "joe",
       "hash_for_linux"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] hello_world on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hello_world/Ubuntu-12.04/hash_for_l\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Ubuntu-12.04/hash_for_l:2:0\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Ubuntu-12.04/hash_for_l:2:1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 1, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10100\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10100\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm-dev.appspot.com/user/task/10000@@@",
       "@@@STEP_LINK@shard #1@https://chromium-swarm-dev.appspot.com/user/task/10100@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
       "--priority",
       "30",
       "--shards",
       "1",
       "--task-name",
@@ skipping 31 matching lines @@
       "--tag",
       "rietveld:https://codereview.chromium.org/123/#ps1001",
       "--tag",
       "stepname:hello_world on Mac-10.9",
       "--verbose",
       "--idempotent",
       "--user",
       "joe",
       "hash_for_mac"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] hello_world on Mac-10.9",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hello_world/Mac-10.9/hash_for_m\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Mac-10.9/hash_for_m\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm-dev.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "echo",
       "running something locally"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "local step"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--verbose",
       "--json",
       "{\"base_task_name\": \"hello_world/Windows-7-SP1/hash_for_w\", \"tasks\": {\"hello_world/Windows-7-SP1/hash_for_w\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
-      "[TMP]/hello_isolated_world_tmp_1/task_output_dir"
+      "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "hello_world on Windows-7-SP1",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"abandoned_ts\": null, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"bot_id\": \"vm30\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
@@ skipping 28 matching lines @@
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--verbose",
       "--json",
       "{\"base_task_name\": \"hello_world/Ubuntu-12.04/hash_for_l\", \"tasks\": {\"hello_world/Ubuntu-12.04/hash_for_l:2:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}, \"hello_world/Ubuntu-12.04/hash_for_l:2:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10100\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
-      "[TMP]/hello_isolated_world_tmp_1/task_output_dir"
+      "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "hello_world on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"abandoned_ts\": null, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"bot_id\": \"vm30\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
@@ skipping 62 matching lines @@
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@",
       "@@@STEP_LINK@shard #1 isolated out@blah@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--verbose",
       "--json",
       "{\"base_task_name\": \"hello_world/Mac-10.9/hash_for_m\", \"tasks\": {\"hello_world/Mac-10.9/hash_for_m\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
-      "[TMP]/hello_isolated_world_tmp_1/task_output_dir"
+      "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "hello_world on Mac-10.9",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"abandoned_ts\": null, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"bot_id\": \"vm30\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
@@ skipping 29 matching lines @@
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[TMP]/hello_isolated_world_tmp_1"
+      "[TMP_BASE]/hello_isolated_world_tmp_1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree remove temp dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]