| Index: scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json | 
| diff --git a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json b/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json | 
| index b0f12ef3fd8de89e8554b8fe438949b0bf8b0fc5..568ea89b1203ec99316d7de1c3cc6f922b1cc1d9 100644 | 
| --- a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json | 
| +++ b/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json | 
| @@ -11,20 +11,19 @@ | 
| "--slave", | 
| "build1-a1", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--output_json", | 
| "/path/to/tmp/json", | 
| "--revision", | 
| "src@r6", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -98,7 +97,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "ensure_goma" | 
| }, | 
| { | 
| @@ -109,17 +107,16 @@ | 
| "--platform", | 
| "linux-amd64", | 
| "--dest-directory", | 
| -      "[SLAVE_BUILD]/cipd", | 
| +      "[CWD]/cipd", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "ensure_goma.install cipd", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"fake_slave_build/cipd\", @@@", | 
| "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", | 
| "@@@STEP_LOG_LINE@json.output@}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| @@ -127,10 +124,10 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/cipd/cipd", | 
| +      "fake_slave_build/cipd", | 
| "ensure", | 
| "--root", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--list", | 
| "infra_internal/goma/client/linux-amd64 release", | 
| "--json-output", | 
| @@ -138,7 +135,6 @@ | 
| "--service-account-json", | 
| "/creds/service_accounts/service-account-goma-client.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "ensure_goma.ensure_installed", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -157,10 +153,9 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "--version" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "swarming.py --version", | 
| "stdout": "/path/to/tmp/", | 
| "~followup_annotations": [ | 
| @@ -174,11 +169,10 @@ | 
| "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_CHROMIUM_NO_ACTION": "1", | 
| -      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| +      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "gclient runhooks" | 
| @@ -187,7 +181,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", | 
| +      "[CWD]/src/testing/scripts/get_compile_targets.py", | 
| "--output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -195,11 +189,10 @@ | 
| "Release", | 
| "--use-src-side-runtest-py", | 
| "--paths", | 
| -      "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| +      "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| "--properties", | 
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "get compile targets for scripts", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{}@@@", | 
| @@ -211,13 +204,12 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json", | 
| +      "[CWD]/src/testing/buildbot/chromium.linux.json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "read test spec", | 
| "~followup_annotations": [ | 
| -      "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@", | 
| +      "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@", | 
| "@@@STEP_LOG_LINE@json.output@{}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| ] | 
| @@ -229,7 +221,7 @@ | 
| "--format=%H", | 
| "r1..r6" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]/src", | 
| +    "cwd": "[CWD]/src", | 
| "name": "git commits in range", | 
| "stdout": "/path/to/tmp/", | 
| "~followup_annotations": [ | 
| @@ -247,7 +239,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7" | 
| }, | 
| { | 
| @@ -262,20 +253,19 @@ | 
| "--slave", | 
| "build1-a1", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--output_json", | 
| "/path/to/tmp/json", | 
| "--revision", | 
| "src@r7", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -350,7 +340,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.ensure_goma", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -364,17 +353,16 @@ | 
| "--platform", | 
| "linux-amd64", | 
| "--dest-directory", | 
| -      "[SLAVE_BUILD]/cipd", | 
| +      "[CWD]/cipd", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.ensure_goma.install cipd", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@2@@@", | 
| "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"fake_slave_build/cipd\", @@@", | 
| "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", | 
| "@@@STEP_LOG_LINE@json.output@}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| @@ -382,10 +370,10 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/cipd/cipd", | 
| +      "fake_slave_build/cipd", | 
| "ensure", | 
| "--root", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--list", | 
| "infra_internal/goma/client/linux-amd64 release", | 
| "--json-output", | 
| @@ -393,7 +381,6 @@ | 
| "--service-account-json", | 
| "/creds/service_accounts/service-account-goma-client.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.ensure_goma.ensure_installed", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@2@@@", | 
| @@ -415,11 +402,10 @@ | 
| "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_CHROMIUM_NO_ACTION": "1", | 
| -      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| +      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "test r7.gclient runhooks", | 
| @@ -431,7 +417,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", | 
| +      "[CWD]/src/testing/scripts/get_compile_targets.py", | 
| "--output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -439,11 +425,10 @@ | 
| "Release", | 
| "--use-src-side-runtest-py", | 
| "--paths", | 
| -      "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| +      "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| "--properties", | 
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.get compile targets for scripts", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -456,14 +441,13 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json", | 
| +      "[CWD]/src/testing/buildbot/chromium.linux.json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.read test spec", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| -      "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@", | 
| +      "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@", | 
| "@@@STEP_LOG_LINE@json.output@{}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| ] | 
| @@ -472,19 +456,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "chromium.linux", | 
| "-b", | 
| "Linux Builder", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.generate_build_files", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -496,13 +479,12 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::findit]/resources/check_target_existence.py", | 
| "--target-build-dir", | 
| -      "[SLAVE_BUILD]/src/out/Release", | 
| +      "[CWD]/src/out/Release", | 
| "--target", | 
| "target_name", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.check_targets", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -524,7 +506,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.cleanup_temp", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -534,19 +515,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "chromium.linux", | 
| "-b", | 
| "Linux Builder", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r7.generate_build_files (2)", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -567,9 +547,9 @@ | 
| "--target", | 
| "Release", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src", | 
| +      "[CWD]/src", | 
| "--goma-cache-dir", | 
| -      "[GOMA_CACHE]", | 
| +      "[ROOT]/b/build/slave/goma_cache", | 
| "--build-tool", | 
| "ninja", | 
| "--compiler", | 
| @@ -579,12 +559,11 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--ninja-ensure-up-to-date", | 
| "--", | 
| "target_name" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -601,7 +580,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3" | 
| }, | 
| { | 
| @@ -616,20 +594,19 @@ | 
| "--slave", | 
| "build1-a1", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--output_json", | 
| "/path/to/tmp/json", | 
| "--revision", | 
| "src@r3", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -704,7 +681,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.ensure_goma", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -718,17 +694,16 @@ | 
| "--platform", | 
| "linux-amd64", | 
| "--dest-directory", | 
| -      "[SLAVE_BUILD]/cipd", | 
| +      "[CWD]/cipd", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.ensure_goma.install cipd", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@2@@@", | 
| "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"fake_slave_build/cipd\", @@@", | 
| "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", | 
| "@@@STEP_LOG_LINE@json.output@}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| @@ -736,10 +711,10 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/cipd/cipd", | 
| +      "fake_slave_build/cipd", | 
| "ensure", | 
| "--root", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--list", | 
| "infra_internal/goma/client/linux-amd64 release", | 
| "--json-output", | 
| @@ -747,7 +722,6 @@ | 
| "--service-account-json", | 
| "/creds/service_accounts/service-account-goma-client.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.ensure_goma.ensure_installed", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@2@@@", | 
| @@ -769,11 +743,10 @@ | 
| "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_CHROMIUM_NO_ACTION": "1", | 
| -      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| +      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "test r3.gclient runhooks", | 
| @@ -785,7 +758,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", | 
| +      "[CWD]/src/testing/scripts/get_compile_targets.py", | 
| "--output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -793,11 +766,10 @@ | 
| "Release", | 
| "--use-src-side-runtest-py", | 
| "--paths", | 
| -      "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| +      "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| "--properties", | 
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.get compile targets for scripts", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -810,14 +782,13 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json", | 
| +      "[CWD]/src/testing/buildbot/chromium.linux.json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.read test spec", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| -      "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@", | 
| +      "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@", | 
| "@@@STEP_LOG_LINE@json.output@{}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| ] | 
| @@ -826,19 +797,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "chromium.linux", | 
| "-b", | 
| "Linux Builder", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.generate_build_files", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -850,13 +820,12 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::findit]/resources/check_target_existence.py", | 
| "--target-build-dir", | 
| -      "[SLAVE_BUILD]/src/out/Release", | 
| +      "[CWD]/src/out/Release", | 
| "--target", | 
| "target_name", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.check_targets", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -878,7 +847,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.cleanup_temp", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -888,19 +856,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "chromium.linux", | 
| "-b", | 
| "Linux Builder", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r3.generate_build_files (2)", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -921,9 +888,9 @@ | 
| "--target", | 
| "Release", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src", | 
| +      "[CWD]/src", | 
| "--goma-cache-dir", | 
| -      "[GOMA_CACHE]", | 
| +      "[ROOT]/b/build/slave/goma_cache", | 
| "--build-tool", | 
| "ninja", | 
| "--compiler", | 
| @@ -933,12 +900,11 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--ninja-ensure-up-to-date", | 
| "--", | 
| "target_name" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -951,7 +917,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4" | 
| }, | 
| { | 
| @@ -966,20 +931,19 @@ | 
| "--slave", | 
| "build1-a1", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--output_json", | 
| "/path/to/tmp/json", | 
| "--revision", | 
| "src@r4", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -1054,7 +1018,6 @@ | 
| }, | 
| { | 
| "cmd": [], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.ensure_goma", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -1068,17 +1031,16 @@ | 
| "--platform", | 
| "linux-amd64", | 
| "--dest-directory", | 
| -      "[SLAVE_BUILD]/cipd", | 
| +      "[CWD]/cipd", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.ensure_goma.install cipd", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@2@@@", | 
| "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"fake_slave_build/cipd\", @@@", | 
| "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", | 
| "@@@STEP_LOG_LINE@json.output@}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| @@ -1086,10 +1048,10 @@ | 
| }, | 
| { | 
| "cmd": [ | 
| -      "[SLAVE_BUILD]/cipd/cipd", | 
| +      "fake_slave_build/cipd", | 
| "ensure", | 
| "--root", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--list", | 
| "infra_internal/goma/client/linux-amd64 release", | 
| "--json-output", | 
| @@ -1097,7 +1059,6 @@ | 
| "--service-account-json", | 
| "/creds/service_accounts/service-account-goma-client.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.ensure_goma.ensure_installed", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@2@@@", | 
| @@ -1119,11 +1080,10 @@ | 
| "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_CHROMIUM_NO_ACTION": "1", | 
| -      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| +      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "test r4.gclient runhooks", | 
| @@ -1135,7 +1095,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", | 
| +      "[CWD]/src/testing/scripts/get_compile_targets.py", | 
| "--output", | 
| "/path/to/tmp/json", | 
| "--", | 
| @@ -1143,11 +1103,10 @@ | 
| "Release", | 
| "--use-src-side-runtest-py", | 
| "--paths", | 
| -      "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| +      "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", | 
| "--properties", | 
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.get compile targets for scripts", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -1160,14 +1119,13 @@ | 
| "python", | 
| "-u", | 
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json", | 
| +      "[CWD]/src/testing/buildbot/chromium.linux.json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.read test spec", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| -      "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@", | 
| +      "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@", | 
| "@@@STEP_LOG_LINE@json.output@{}@@@", | 
| "@@@STEP_LOG_END@json.output@@@" | 
| ] | 
| @@ -1176,19 +1134,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "chromium.linux", | 
| "-b", | 
| "Linux Builder", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.generate_build_files", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -1200,13 +1157,12 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::findit]/resources/check_target_existence.py", | 
| "--target-build-dir", | 
| -      "[SLAVE_BUILD]/src/out/Release", | 
| +      "[CWD]/src/out/Release", | 
| "--target", | 
| "target_name", | 
| "--json-output", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.check_targets", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@", | 
| @@ -1228,7 +1184,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.cleanup_temp", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -1238,19 +1193,18 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb.py", | 
| +      "[CWD]/src/tools/mb/mb.py", | 
| "gen", | 
| "-m", | 
| "chromium.linux", | 
| "-b", | 
| "Linux Builder", | 
| "--config-file", | 
| -      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", | 
| +      "[CWD]/src/tools/mb/mb_config.pyl", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "//out/Release" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test r4.generate_build_files (2)", | 
| "~followup_annotations": [ | 
| "@@@STEP_NEST_LEVEL@1@@@" | 
| @@ -1271,9 +1225,9 @@ | 
| "--target", | 
| "Release", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src", | 
| +      "[CWD]/src", | 
| "--goma-cache-dir", | 
| -      "[GOMA_CACHE]", | 
| +      "[ROOT]/b/build/slave/goma_cache", | 
| "--build-tool", | 
| "ninja", | 
| "--compiler", | 
| @@ -1283,12 +1237,11 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[CACHE]/cipd/goma", | 
| +      "[ROOT]/b/build/slave/cache/cipd/goma", | 
| "--ninja-ensure-up-to-date", | 
| "--", | 
| "target_name" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -1309,7 +1262,6 @@ | 
| "-u", | 
| "import sys; sys.exit(0)" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "report", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@<br/>Culprit: <a href=\"https://crrev.com/r4\">r4</a>@@@", | 
|  |