| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json | 
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json | 
| index c3916c5aba0256c6f7f53333c87500a96b0870f8..c1f339c149ed1789dc0b312ed754275f4c03daf8 100644 | 
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json | 
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json | 
| @@ -11,20 +11,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]" | 
| }, | 
| @@ -61,9 +60,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" | 
| }, | 
| { | 
| @@ -75,7 +73,6 @@ | 
| "python", | 
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "cleanup_temp" | 
| }, | 
| { | 
| @@ -84,10 +81,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" | 
| }, | 
| { | 
| @@ -97,10 +93,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": "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": "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" | 
| @@ -109,10 +104,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": [ | 
| @@ -134,9 +128,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", | 
| @@ -146,11 +140,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" | 
| }, | 
| @@ -166,11 +159,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" | 
| }, | 
| { | 
| @@ -178,28 +171,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@{@@@", | 
| @@ -226,7 +218,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", | 
| @@ -283,7 +275,6 @@ | 
| "--idempotent", | 
| "[dummy hash for audio_decoder_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] audio_decoder_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -304,7 +295,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", | 
| @@ -361,7 +352,6 @@ | 
| "--idempotent", | 
| "[dummy hash for common_audio_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] common_audio_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -382,7 +372,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", | 
| @@ -439,7 +429,6 @@ | 
| "--idempotent", | 
| "[dummy hash for common_video_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] common_video_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -460,7 +449,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", | 
| @@ -517,7 +506,6 @@ | 
| "--idempotent", | 
| "[dummy hash for modules_tests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] modules_tests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -538,7 +526,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", | 
| @@ -595,7 +583,6 @@ | 
| "--idempotent", | 
| "[dummy hash for modules_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] modules_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -616,7 +603,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", | 
| @@ -673,7 +660,6 @@ | 
| "--idempotent", | 
| "[dummy hash for peerconnection_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] peerconnection_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -694,7 +680,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", | 
| @@ -751,7 +737,6 @@ | 
| "--idempotent", | 
| "[dummy hash for rtc_media_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] rtc_media_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -772,7 +757,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", | 
| @@ -829,7 +814,6 @@ | 
| "--idempotent", | 
| "[dummy hash for rtc_pc_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] rtc_pc_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -850,7 +834,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", | 
| @@ -907,7 +891,6 @@ | 
| "--idempotent", | 
| "[dummy hash for rtc_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] rtc_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -928,7 +911,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", | 
| @@ -985,7 +968,6 @@ | 
| "--idempotent", | 
| "[dummy hash for system_wrappers_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] system_wrappers_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1006,7 +988,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", | 
| @@ -1063,7 +1045,6 @@ | 
| "--idempotent", | 
| "[dummy hash for test_support_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] test_support_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1084,7 +1065,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", | 
| @@ -1141,7 +1122,6 @@ | 
| "--idempotent", | 
| "[dummy hash for tools_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] tools_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1162,7 +1142,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", | 
| @@ -1219,7 +1199,6 @@ | 
| "--idempotent", | 
| "[dummy hash for video_engine_tests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] video_engine_tests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1240,7 +1219,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", | 
| @@ -1297,7 +1276,6 @@ | 
| "--idempotent", | 
| "[dummy hash for voice_engine_unittests]" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "[trigger] voice_engine_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_LOG_LINE@json.output@{@@@", | 
| @@ -1339,14 +1317,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", | 
| @@ -1358,7 +1335,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "audio_decoder_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1407,7 +1383,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", | 
| @@ -1419,7 +1395,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "common_audio_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1468,7 +1443,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", | 
| @@ -1480,7 +1455,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "common_video_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1529,7 +1503,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", | 
| @@ -1541,7 +1515,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "modules_tests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1590,7 +1563,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", | 
| @@ -1602,7 +1575,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "modules_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1651,7 +1623,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", | 
| @@ -1663,7 +1635,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "peerconnection_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1712,7 +1683,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", | 
| @@ -1724,7 +1695,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rtc_media_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1773,7 +1743,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", | 
| @@ -1785,7 +1755,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rtc_pc_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1834,7 +1803,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", | 
| @@ -1846,7 +1815,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "rtc_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1895,7 +1863,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", | 
| @@ -1907,7 +1875,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "system_wrappers_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -1956,7 +1923,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", | 
| @@ -1968,7 +1935,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "test_support_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2017,7 +1983,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", | 
| @@ -2029,7 +1995,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "tools_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2078,7 +2043,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", | 
| @@ -2090,7 +2055,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "video_engine_tests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
| @@ -2139,7 +2103,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", | 
| @@ -2151,7 +2115,6 @@ | 
| "--task-summary-json", | 
| "/path/to/tmp/json" | 
| ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| "name": "voice_engine_unittests on Ubuntu", | 
| "~followup_annotations": [ | 
| "@@@STEP_TEXT@swarming pending 71s@@@", | 
|  |