Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_ubsan.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json
index e5c6cb204eb0bd79207940fc807dfa73fbfd33bb..7ad8e0934188b9f71ff31b3104b64930271032b8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json
@@ -11,13 +11,13 @@
"--slave",
"slavename",
"--spec",
- "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'}]",
+ "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'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--issue",
"666666",
"--patchset",
@@ -30,6 +30,7 @@
"src@12345",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -66,8 +67,9 @@
"python",
"-u",
"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
- "[CWD]/src/out"
+ "[SLAVE_BUILD]/src/out"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean test output files"
},
{
@@ -79,6 +81,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -88,9 +91,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_DEFINES": "clang=1 component=static_library dcheck_always_on=1 disable_nacl=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/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 fastbuild=1 ffmpeg_branding=Chrome gomadir='[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"
@@ -102,10 +106,11 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -132,9 +137,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -144,12 +149,13 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[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"
},
@@ -179,10 +185,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/audio_decoder_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/audio_decoder_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "audio_decoder_unittests"
},
{
@@ -205,10 +212,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/common_audio_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/common_audio_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "common_audio_unittests"
},
{
@@ -231,10 +239,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/common_video_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/common_video_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "common_video_unittests"
},
{
@@ -257,10 +266,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/modules_tests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/modules_tests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "modules_tests"
},
{
@@ -283,10 +293,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/modules_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/modules_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "modules_unittests"
},
{
@@ -309,10 +320,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/peerconnection_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/peerconnection_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "peerconnection_unittests"
},
{
@@ -335,10 +347,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/rtc_media_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/rtc_media_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rtc_media_unittests"
},
{
@@ -361,10 +374,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/rtc_pc_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/rtc_pc_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rtc_pc_unittests"
},
{
@@ -387,10 +401,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/rtc_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/rtc_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rtc_unittests"
},
{
@@ -413,10 +428,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/system_wrappers_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/system_wrappers_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "system_wrappers_unittests"
},
{
@@ -439,10 +455,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/test_support_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/test_support_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "test_support_unittests"
},
{
@@ -465,10 +482,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/tools_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/tools_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "tools_unittests"
},
{
@@ -491,10 +509,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/video_engine_tests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/video_engine_tests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "video_engine_tests"
},
{
@@ -517,10 +536,11 @@
"--run-python-script",
"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--enable-tsan",
- "[CWD]/src/third_party/gtest-parallel/gtest-parallel",
- "[CWD]/src/out/Release/voice_engine_unittests",
+ "[SLAVE_BUILD]/src/third_party/gtest-parallel/gtest-parallel",
+ "[SLAVE_BUILD]/src/out/Release/voice_engine_unittests",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "voice_engine_unittests"
},
{
@@ -546,6 +566,7 @@
"--enable-tsan",
"webrtc_nonparallel_tests"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webrtc_nonparallel_tests"
},
{
« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_ubsan.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698