| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_dbg.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_dbg.json
|
| index 1034ec64d8ed0b87726c124eaeb6ddabb4b83787..dd58967516494c760966c77654788470fc02f85c 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_dbg.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_dbg.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,13 +33,13 @@
|
| "--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",
|
| "--issue",
|
| "666666",
|
| "--patchset",
|
| @@ -53,7 +52,6 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -90,9 +88,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"
|
| },
|
| {
|
| @@ -104,7 +101,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -114,10 +110,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=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -129,11 +124,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"
|
| },
|
| @@ -160,9 +154,9 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[CWD]/src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]/b/build/slave/goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -172,13 +166,12 @@
|
| "--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",
|
| "--",
|
| "All"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -206,11 +199,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/audio_decoder_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/audio_decoder_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "audio_decoder_unittests"
|
| },
|
| {
|
| @@ -231,11 +223,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/common_audio_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/common_audio_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_audio_unittests"
|
| },
|
| {
|
| @@ -256,11 +247,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/common_video_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/common_video_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_video_unittests"
|
| },
|
| {
|
| @@ -281,11 +271,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/modules_tests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/modules_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_tests"
|
| },
|
| {
|
| @@ -306,11 +295,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/modules_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/modules_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_unittests"
|
| },
|
| {
|
| @@ -331,11 +319,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/peerconnection_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/peerconnection_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "peerconnection_unittests"
|
| },
|
| {
|
| @@ -356,11 +343,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/rtc_media_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/rtc_media_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_media_unittests"
|
| },
|
| {
|
| @@ -381,11 +367,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/rtc_pc_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/rtc_pc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_pc_unittests"
|
| },
|
| {
|
| @@ -406,11 +391,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/rtc_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/rtc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_unittests"
|
| },
|
| {
|
| @@ -431,11 +415,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/system_wrappers_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/system_wrappers_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "system_wrappers_unittests"
|
| },
|
| {
|
| @@ -456,11 +439,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_support_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/test_support_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_support_unittests"
|
| },
|
| {
|
| @@ -481,11 +463,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/tools_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/tools_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tools_unittests"
|
| },
|
| {
|
| @@ -506,11 +487,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/video_engine_tests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/video_engine_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "video_engine_tests"
|
| },
|
| {
|
| @@ -531,11 +511,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/voice_engine_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/voice_engine_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "voice_engine_unittests"
|
| },
|
| {
|
| @@ -556,11 +535,10 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Debug/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Debug/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "libjingle_peerconnection_objc_test"
|
| },
|
| {
|
| @@ -584,7 +562,6 @@
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "webrtc_nonparallel_tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|