| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_tsan_v2.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_tsan_v2.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_tsan_v2.json
|
| index 110b80d9b4f01312fdab3001d6621a534a08fd48..2bfba4280cf4d00a2c46e32333ab4d0463dbcd5c 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_tsan_v2.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_tsan_v2.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"
|
| },
|
| {
|
| @@ -85,10 +82,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 disable_nacl=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 tsan=1 use_goma=1",
|
| + "GYP_DEFINES": "clang=1 component=static_library dcheck_always_on=1 disable_nacl=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 tsan=1 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -100,11 +96,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"
|
| },
|
| @@ -131,9 +126,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",
|
| @@ -143,11 +138,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"
|
| },
|
| @@ -177,11 +171,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/audio_decoder_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/audio_decoder_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "audio_decoder_unittests"
|
| },
|
| {
|
| @@ -204,11 +197,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/common_audio_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/common_audio_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_audio_unittests"
|
| },
|
| {
|
| @@ -231,11 +223,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/common_video_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/common_video_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "common_video_unittests"
|
| },
|
| {
|
| @@ -258,11 +249,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/modules_tests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/modules_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_tests"
|
| },
|
| {
|
| @@ -285,11 +275,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/modules_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/modules_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "modules_unittests"
|
| },
|
| {
|
| @@ -312,11 +301,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/peerconnection_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/peerconnection_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "peerconnection_unittests"
|
| },
|
| {
|
| @@ -339,11 +327,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/rtc_media_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/rtc_media_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_media_unittests"
|
| },
|
| {
|
| @@ -366,11 +353,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/rtc_pc_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/rtc_pc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_pc_unittests"
|
| },
|
| {
|
| @@ -393,11 +379,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/rtc_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/rtc_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rtc_unittests"
|
| },
|
| {
|
| @@ -420,11 +405,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/system_wrappers_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/system_wrappers_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "system_wrappers_unittests"
|
| },
|
| {
|
| @@ -447,11 +431,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/test_support_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/test_support_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_support_unittests"
|
| },
|
| {
|
| @@ -474,11 +457,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/tools_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/tools_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tools_unittests"
|
| },
|
| {
|
| @@ -501,11 +483,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/video_engine_tests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/video_engine_tests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "video_engine_tests"
|
| },
|
| {
|
| @@ -528,11 +509,10 @@
|
| "--run-python-script",
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--enable-tsan",
|
| - "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
|
| - "[SLAVE_BUILD]/src/out/Release/voice_engine_unittests",
|
| + "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
|
| + "[CWD]/src/out/Release/voice_engine_unittests",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "voice_engine_unittests"
|
| },
|
| {
|
| @@ -561,7 +541,6 @@
|
| "--enable-tsan",
|
| "webrtc_nonparallel_tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| {
|
|
|