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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.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
Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json
index 8dfd350800fc59ede581401e72ed3589175bbf98..9b02b40175ed364c66fbe77843373afd28dce504 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json
@@ -11,19 +11,20 @@
"--slave",
"slavename",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, '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 = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, '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]",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@12345",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -60,8 +61,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"
},
{
@@ -73,6 +75,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -82,9 +85,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": "build_for_tool=memcheck component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "build_for_tool=memcheck component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -104,9 +108,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",
@@ -116,10 +120,11 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[BUILD]/goma",
"--",
"All"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -152,12 +157,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"audio_decoder_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "audio_decoder_unittests"
},
{
@@ -183,12 +189,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"common_audio_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "common_audio_unittests"
},
{
@@ -214,12 +221,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"common_video_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "common_video_unittests"
},
{
@@ -245,12 +253,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"modules_tests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "modules_tests"
},
{
@@ -276,12 +285,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"modules_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "modules_unittests"
},
{
@@ -307,12 +317,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"peerconnection_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "peerconnection_unittests"
},
{
@@ -338,12 +349,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"rtc_media_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rtc_media_unittests"
},
{
@@ -369,12 +381,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"rtc_pc_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rtc_pc_unittests"
},
{
@@ -400,12 +413,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"rtc_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rtc_unittests"
},
{
@@ -431,12 +445,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"system_wrappers_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "system_wrappers_unittests"
},
{
@@ -462,12 +477,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"test_support_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "test_support_unittests"
},
{
@@ -493,12 +509,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"tools_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "tools_unittests"
},
{
@@ -524,12 +541,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"video_engine_tests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "video_engine_tests"
},
{
@@ -555,12 +573,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"voice_engine_unittests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "voice_engine_unittests"
},
{
@@ -586,12 +605,13 @@
"--pass-build-dir",
"--pass-target",
"--run-shell-script",
- "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+ "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
"--test",
"webrtc_nonparallel_tests",
"--tool",
"memcheck"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webrtc_nonparallel_tests"
},
{

Powered by Google App Engine
This is Rietveld 408576698