| Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json
 | 
| diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json
 | 
| index 01033797a99546212ec53db308539f0a1a4c6ad3..881728348d67b10acdd6d27360a88444af0db5b6 100644
 | 
| --- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json
 | 
| +++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.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'}]",
 | 
| +      "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'}]",
 | 
|        "--root",
 | 
|        "v8",
 | 
|        "--revision_mapping_file",
 | 
|        "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}",
 | 
|        "--git-cache-dir",
 | 
| -      "[GIT_CACHE]",
 | 
| +      "[ROOT]/b/build/slave/cache_dir",
 | 
|        "--issue",
 | 
|        "12853011",
 | 
|        "--patchset",
 | 
| @@ -31,7 +31,6 @@
 | 
|        "--no_shallow",
 | 
|        "--output_manifest"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "env": {
 | 
|        "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
 | 
|      },
 | 
| @@ -75,10 +74,9 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
 | 
| +      "[CWD]/v8/tools/swarming_client/swarming.py",
 | 
|        "--version"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "swarming.py --version",
 | 
|      "stdout": "/path/to/tmp/",
 | 
|      "~followup_annotations": [
 | 
| @@ -92,10 +90,9 @@
 | 
|        "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
 | 
|        "runhooks"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "env": {
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| -      "GYP_DEFINES": "clang=1 dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
 | 
| +      "GYP_DEFINES": "clang=1 dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
 | 
|        "GYP_GENERATORS": "ninja",
 | 
|        "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
 | 
|      },
 | 
| @@ -110,7 +107,6 @@
 | 
|        "python",
 | 
|        "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "cleanup_temp"
 | 
|    },
 | 
|    {
 | 
| @@ -120,11 +116,10 @@
 | 
|        "-u",
 | 
|        "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
 | 
|        "--src-dir",
 | 
| -      "[SLAVE_BUILD]/v8",
 | 
| +      "[CWD]/v8",
 | 
|        "--output-json",
 | 
|        "/path/to/tmp/json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "env": {
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
 | 
|      },
 | 
| @@ -151,9 +146,9 @@
 | 
|        "--target",
 | 
|        "Release",
 | 
|        "--src-dir",
 | 
| -      "[SLAVE_BUILD]/v8",
 | 
| +      "[CWD]/v8",
 | 
|        "--goma-cache-dir",
 | 
| -      "[GOMA_CACHE]",
 | 
| +      "[ROOT]/b/build/slave/goma_cache",
 | 
|        "--build-tool",
 | 
|        "ninja",
 | 
|        "--compiler",
 | 
| @@ -163,12 +158,11 @@
 | 
|        "--goma-service-account-json-file",
 | 
|        "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "--goma-dir",
 | 
| -      "[BUILD]/goma",
 | 
| +      "[ROOT]/b/build/goma",
 | 
|        "--goma-fail-fast",
 | 
|        "--goma-disable-local-fallback",
 | 
|        "--"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "env": {
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
 | 
|      },
 | 
| @@ -183,20 +177,19 @@
 | 
|        "python",
 | 
|        "-u",
 | 
|        "RECIPE_MODULE[build::isolate]/resources/isolate.py",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client",
 | 
| +      "[CWD]/v8/tools/swarming_client",
 | 
|        "batcharchive",
 | 
|        "--dump-json",
 | 
|        "/path/to/tmp/json",
 | 
|        "--isolate-server",
 | 
|        "https://isolateserver.appspot.com",
 | 
|        "--verbose",
 | 
| -      "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json",
 | 
| -      "[SLAVE_BUILD]/v8/out/Release/ignition.isolated.gen.json",
 | 
| -      "[SLAVE_BUILD]/v8/out/Release/mozilla.isolated.gen.json",
 | 
| -      "[SLAVE_BUILD]/v8/out/Release/simdjs.isolated.gen.json",
 | 
| -      "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json"
 | 
| +      "[CWD]/v8/out/Release/bot_default.isolated.gen.json",
 | 
| +      "[CWD]/v8/out/Release/ignition.isolated.gen.json",
 | 
| +      "[CWD]/v8/out/Release/mozilla.isolated.gen.json",
 | 
| +      "[CWD]/v8/out/Release/simdjs.isolated.gen.json",
 | 
| +      "[CWD]/v8/out/Release/test262.isolated.gen.json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "isolate tests",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| @@ -213,7 +206,7 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
 | 
| +      "[CWD]/v8/tools/swarming_client/swarming.py",
 | 
|        "trigger",
 | 
|        "--swarming",
 | 
|        "https://chromium-swarm.appspot.com",
 | 
| @@ -294,7 +287,6 @@
 | 
|        "--json-test-results",
 | 
|        "${ISOLATED_OUTDIR}/output.json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "[trigger] Check on Mac-10.9",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| @@ -315,7 +307,7 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
 | 
| +      "[CWD]/v8/tools/swarming_client/swarming.py",
 | 
|        "trigger",
 | 
|        "--swarming",
 | 
|        "https://chromium-swarm.appspot.com",
 | 
| @@ -397,7 +389,6 @@
 | 
|        "--json-test-results",
 | 
|        "${ISOLATED_OUTDIR}/output.json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "[trigger] Test262 - no variants on Mac-10.9",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| @@ -418,7 +409,7 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
 | 
| +      "[CWD]/v8/tools/swarming_client/swarming.py",
 | 
|        "trigger",
 | 
|        "--swarming",
 | 
|        "https://chromium-swarm.appspot.com",
 | 
| @@ -499,7 +490,6 @@
 | 
|        "--json-test-results",
 | 
|        "${ISOLATED_OUTDIR}/output.json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "[trigger] Mozilla on Mac-10.9",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| @@ -520,7 +510,7 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
 | 
| +      "[CWD]/v8/tools/swarming_client/swarming.py",
 | 
|        "trigger",
 | 
|        "--swarming",
 | 
|        "https://chromium-swarm.appspot.com",
 | 
| @@ -602,7 +592,6 @@
 | 
|        "--json-test-results",
 | 
|        "${ISOLATED_OUTDIR}/output.json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "[trigger] SimdJs - all on Mac-10.9",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| @@ -623,7 +612,7 @@
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
 | 
| +      "[CWD]/v8/tools/swarming_client/swarming.py",
 | 
|        "trigger",
 | 
|        "--swarming",
 | 
|        "https://chromium-swarm.appspot.com",
 | 
| @@ -705,7 +694,6 @@
 | 
|        "--json-test-results",
 | 
|        "${ISOLATED_OUTDIR}/output.json"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "[trigger] Ignition - turbofan on Mac-10.9",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@json.output@{@@@",
 | 
| @@ -729,9 +717,9 @@
 | 
|        "-u",
 | 
|        "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
 | 
|        "--swarming-client-dir",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client",
 | 
| +      "[CWD]/v8/tools/swarming_client",
 | 
|        "--temp-root-dir",
 | 
| -      "[TMP_BASE]",
 | 
| +      "[TMP]",
 | 
|        "--merged-test-output",
 | 
|        "/path/to/tmp/json",
 | 
|        "--",
 | 
| @@ -744,7 +732,6 @@
 | 
|        "1",
 | 
|        "Check/Mac-10.9/[dummy has/v8_mac64_rel/571"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "Check",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
 | 
| @@ -770,9 +757,9 @@
 | 
|        "-u",
 | 
|        "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
 | 
|        "--swarming-client-dir",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client",
 | 
| +      "[CWD]/v8/tools/swarming_client",
 | 
|        "--temp-root-dir",
 | 
| -      "[TMP_BASE]",
 | 
| +      "[TMP]",
 | 
|        "--merged-test-output",
 | 
|        "/path/to/tmp/json",
 | 
|        "--",
 | 
| @@ -785,7 +772,6 @@
 | 
|        "1",
 | 
|        "Test262 - no variants/Mac-10.9/[dummy has/v8_mac64_rel/571"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "Test262 - no variants",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
 | 
| @@ -811,9 +797,9 @@
 | 
|        "-u",
 | 
|        "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
 | 
|        "--swarming-client-dir",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client",
 | 
| +      "[CWD]/v8/tools/swarming_client",
 | 
|        "--temp-root-dir",
 | 
| -      "[TMP_BASE]",
 | 
| +      "[TMP]",
 | 
|        "--merged-test-output",
 | 
|        "/path/to/tmp/json",
 | 
|        "--",
 | 
| @@ -826,7 +812,6 @@
 | 
|        "1",
 | 
|        "Mozilla/Mac-10.9/[dummy has/v8_mac64_rel/571"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "Mozilla",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
 | 
| @@ -852,9 +837,9 @@
 | 
|        "-u",
 | 
|        "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
 | 
|        "--swarming-client-dir",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client",
 | 
| +      "[CWD]/v8/tools/swarming_client",
 | 
|        "--temp-root-dir",
 | 
| -      "[TMP_BASE]",
 | 
| +      "[TMP]",
 | 
|        "--merged-test-output",
 | 
|        "/path/to/tmp/json",
 | 
|        "--",
 | 
| @@ -867,7 +852,6 @@
 | 
|        "1",
 | 
|        "SimdJs - all/Mac-10.9/[dummy has/v8_mac64_rel/571"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "SimdJs - all",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
 | 
| @@ -893,9 +877,9 @@
 | 
|        "-u",
 | 
|        "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
 | 
|        "--swarming-client-dir",
 | 
| -      "[SLAVE_BUILD]/v8/tools/swarming_client",
 | 
| +      "[CWD]/v8/tools/swarming_client",
 | 
|        "--temp-root-dir",
 | 
| -      "[TMP_BASE]",
 | 
| +      "[TMP]",
 | 
|        "--merged-test-output",
 | 
|        "/path/to/tmp/json",
 | 
|        "--",
 | 
| @@ -908,7 +892,6 @@
 | 
|        "1",
 | 
|        "Ignition - turbofan/Mac-10.9/[dummy has/v8_mac64_rel/571"
 | 
|      ],
 | 
| -    "cwd": "[SLAVE_BUILD]",
 | 
|      "name": "Ignition - turbofan",
 | 
|      "~followup_annotations": [
 | 
|        "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
 | 
| 
 |