| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_mac64_release__swarming_.json | 
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_mac64_release__swarming_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_mac64_release__swarming_.json | 
| index 55783c59a8d12406060badee82ee9ef057c2f0f9..0fca219cb0e37dce0e56cd32c6c0532f6adea04e 100644 | 
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_mac64_release__swarming_.json | 
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_mac64_release__swarming_.json | 
| @@ -5,7 +5,6 @@ | 
| "--json-file", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "host and tools info", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@", | 
| @@ -34,20 +33,19 @@ | 
| "--slave", | 
| "slavename", | 
| "--spec", | 
| -      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]", | 
| +      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]", | 
| "--root", | 
| "src", | 
| "--revision_mapping_file", | 
| "{\"src\": \"got_revision\"}", | 
| "--git-cache-dir", | 
| -      "[GIT_CACHE]", | 
| +      "[ROOT]/b/build/slave/cache_dir", | 
| "--output_json", | 
| "/path/to/tmp/json", | 
| "--revision", | 
| "src@12345", | 
| "--output_manifest" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| @@ -84,9 +82,8 @@ | 
| "python", | 
| "-u", | 
| "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py", | 
| -      "[SLAVE_BUILD]/src/out" | 
| +      "[CWD]/src/out" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "clean test output files" | 
| }, | 
| { | 
| @@ -98,7 +95,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "cleanup_temp" | 
| }, | 
| { | 
| @@ -107,10 +103,9 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py", | 
| "--build-dir", | 
| -      "[SLAVE_BUILD]/src/out/Release", | 
| +      "[CWD]/src/out/Release", | 
| "--clean-isolated-files" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "clean isolated files" | 
| }, | 
| { | 
| @@ -120,10 +115,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 component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| +      "GYP_DEFINES": "clang=1 component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", | 
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| }, | 
| "name": "gclient runhooks" | 
| @@ -132,10 +126,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": [ | 
| @@ -149,11 +142,10 @@ | 
| "-u", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src", | 
| +      "[CWD]/src", | 
| "--output-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -180,9 +172,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", | 
| @@ -192,11 +184,10 @@ | 
| "--goma-service-account-json-file", | 
| "/creds/service_accounts/service-account-goma-client.json", | 
| "--goma-dir", | 
| -      "[BUILD]/goma", | 
| +      "[ROOT]/b/build/goma", | 
| "--", | 
| "All" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "env": { | 
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" | 
| }, | 
| @@ -212,11 +203,11 @@ | 
| "-u", | 
| "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py", | 
| "--build-dir", | 
| -      "[SLAVE_BUILD]/src/out/Release", | 
| +      "[CWD]/src/out/Release", | 
| "--src-dir", | 
| -      "[SLAVE_BUILD]/src" | 
| +      "[CWD]/src" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| +    "cwd": "[CWD]", | 
| "name": "remove_build_metadata" | 
| }, | 
| { | 
| @@ -224,28 +215,27 @@ | 
| "python", | 
| "-u", | 
| "RECIPE_MODULE[build::isolate]/resources/isolate.py", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client", | 
| +      "[CWD]/src/tools/swarming_client", | 
| "batcharchive", | 
| "--dump-json", | 
| "/path/to/tmp/json", | 
| "--isolate-server", | 
| "https://isolateserver.appspot.com", | 
| -      "[SLAVE_BUILD]/src/out/Release/audio_decoder_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/common_audio_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/common_video_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/modules_tests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/modules_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/peerconnection_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/rtc_media_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/rtc_pc_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/rtc_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/system_wrappers_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/test_support_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/tools_unittests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/video_engine_tests.isolated.gen.json", | 
| -      "[SLAVE_BUILD]/src/out/Release/voice_engine_unittests.isolated.gen.json" | 
| +      "[CWD]/src/out/Release/audio_decoder_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/common_audio_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/common_video_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/modules_tests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/modules_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/peerconnection_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/rtc_media_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/rtc_pc_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/rtc_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/system_wrappers_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/test_support_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/tools_unittests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/video_engine_tests.isolated.gen.json", | 
| +      "[CWD]/src/out/Release/voice_engine_unittests.isolated.gen.json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "isolate tests", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -272,7 +262,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -329,7 +319,6 @@ | 
| "--idempotent", | 
| "[dummy hash for audio_decoder_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] audio_decoder_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -350,7 +339,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -407,7 +396,6 @@ | 
| "--idempotent", | 
| "[dummy hash for common_audio_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] common_audio_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -428,7 +416,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -485,7 +473,6 @@ | 
| "--idempotent", | 
| "[dummy hash for common_video_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] common_video_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -506,7 +493,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -563,7 +550,6 @@ | 
| "--idempotent", | 
| "[dummy hash for modules_tests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] modules_tests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -584,7 +570,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -641,7 +627,6 @@ | 
| "--idempotent", | 
| "[dummy hash for modules_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] modules_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -662,7 +647,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -719,7 +704,6 @@ | 
| "--idempotent", | 
| "[dummy hash for peerconnection_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] peerconnection_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -740,7 +724,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -797,7 +781,6 @@ | 
| "--idempotent", | 
| "[dummy hash for rtc_media_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] rtc_media_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -818,7 +801,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -875,7 +858,6 @@ | 
| "--idempotent", | 
| "[dummy hash for rtc_pc_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] rtc_pc_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -896,7 +878,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -953,7 +935,6 @@ | 
| "--idempotent", | 
| "[dummy hash for rtc_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] rtc_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -974,7 +955,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1031,7 +1012,6 @@ | 
| "--idempotent", | 
| "[dummy hash for system_wrappers_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] system_wrappers_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1052,7 +1032,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1109,7 +1089,6 @@ | 
| "--idempotent", | 
| "[dummy hash for test_support_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] test_support_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1130,7 +1109,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1187,7 +1166,6 @@ | 
| "--idempotent", | 
| "[dummy hash for tools_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] tools_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1208,7 +1186,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1265,7 +1243,6 @@ | 
| "--idempotent", | 
| "[dummy hash for video_engine_tests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] video_engine_tests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1286,7 +1263,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "trigger", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1343,7 +1320,6 @@ | 
| "--idempotent", | 
| "[dummy hash for voice_engine_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] voice_engine_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1378,11 +1354,10 @@ | 
| "--build-number=1337", | 
| "--run-python-script", | 
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", | 
| -      "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel", | 
| -      "[SLAVE_BUILD]/src/out/Release/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test", | 
| +      "[CWD]/src/third_party/gtest-parallel/gtest-parallel", | 
| +      "[CWD]/src/out/Release/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test", | 
| "--" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "libjingle_peerconnection_objc_test" | 
| }, | 
| { | 
| @@ -1409,14 +1384,13 @@ | 
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", | 
| "webrtc_nonparallel_tests" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "webrtc_nonparallel_tests" | 
| }, | 
| { | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1428,7 +1402,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "audio_decoder_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1477,7 +1450,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1489,7 +1462,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "common_audio_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1538,7 +1510,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1550,7 +1522,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "common_video_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1599,7 +1570,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1611,7 +1582,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "modules_tests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1660,7 +1630,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1672,7 +1642,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "modules_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1721,7 +1690,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1733,7 +1702,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "peerconnection_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1782,7 +1750,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1794,7 +1762,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rtc_media_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1843,7 +1810,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1855,7 +1822,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rtc_pc_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1904,7 +1870,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1916,7 +1882,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rtc_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1965,7 +1930,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -1977,7 +1942,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "system_wrappers_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2026,7 +1990,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -2038,7 +2002,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test_support_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2087,7 +2050,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -2099,7 +2062,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "tools_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2148,7 +2110,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -2160,7 +2122,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "video_engine_tests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2209,7 +2170,7 @@ | 
| "cmd": [ | 
| "python", | 
| "-u", | 
| -      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", | 
| +      "[CWD]/src/tools/swarming_client/swarming.py", | 
| "collect", | 
| "--swarming", | 
| "https://chromium-swarm.appspot.com", | 
| @@ -2221,7 +2182,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "voice_engine_unittests on Mac", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
|  |