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

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

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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/tryserver_webrtc_android_dbg.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
index f829d723a28a43ec7d6aa700f29294644a8b2dd1..aa82601ac0c8afb9224fc4010aacf260e16a5691 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
@@ -11,13 +11,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'}]\ntarget_os = ['android']",
+ "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'}]\ntarget_os = ['android']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--issue",
"666666",
"--patchset",
@@ -30,7 +30,6 @@
"src@12345",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -67,9 +66,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"
},
{
@@ -77,12 +75,11 @@
"python",
"-u",
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
- "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
- "[SLAVE_BUILD]/src/out/Debug/test_logs",
- "[SLAVE_BUILD]/src/out/build_product.zip",
- "[SLAVE_BUILD]/src"
+ "[CWD]/src/out/Debug/debug_info_dumps",
+ "[CWD]/src/out/Debug/test_logs",
+ "[CWD]/src/out/build_product.zip",
+ "[CWD]/src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -107,12 +104,11 @@
"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_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1",
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -131,9 +127,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",
@@ -143,15 +139,14 @@
"--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",
"--"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "compile",
"~followup_annotations": [
@@ -163,25 +158,23 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/symlink.py",
+ "[CWD]/src/build/symlink.py",
"-f",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
"--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
- "[SLAVE_BUILD]/src/out/logcat"
+ "[CWD]/src/build/android/adb_logcat_monitor.py",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "spawn_logcat_monitor"
},
@@ -192,29 +185,27 @@
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "authorize_adb_devices"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+ "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
"--json-output",
"/path/to/tmp/json",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--known-devices-file",
- "[BUILD]/site_config/.known_devices"
+ "[ROOT]/b/build/site_config/.known_devices"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "device_status_check",
"~followup_annotations": [
@@ -316,18 +307,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "[CWD]/src/build/android/provision_devices.py",
"-t",
"Debug",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--output-device-blacklist",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "provision_devices"
},
@@ -342,31 +332,29 @@
"/tmp/device_monitor.pid",
"--",
"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"[\"07a00ca4\"]",
"tryserver.webrtc",
"android_dbg",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
+ "[CWD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_audio_decoder_unittests",
+ "[CWD]/src/out/Debug/bin/run_audio_decoder_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "audio_decoder_unittests"
},
@@ -374,17 +362,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_common_audio_unittests",
+ "[CWD]/src/out/Debug/bin/run_common_audio_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "common_audio_unittests"
},
@@ -392,17 +379,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_common_video_unittests",
+ "[CWD]/src/out/Debug/bin/run_common_video_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "common_video_unittests"
},
@@ -410,17 +396,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_tests",
+ "[CWD]/src/out/Debug/bin/run_modules_tests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "modules_tests"
},
@@ -428,17 +413,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_unittests",
+ "[CWD]/src/out/Debug/bin/run_modules_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "modules_unittests"
},
@@ -446,17 +430,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_peerconnection_unittests",
+ "[CWD]/src/out/Debug/bin/run_peerconnection_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "peerconnection_unittests"
},
@@ -464,17 +447,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_system_wrappers_unittests",
+ "[CWD]/src/out/Debug/bin/run_system_wrappers_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "system_wrappers_unittests"
},
@@ -482,17 +464,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_test_support_unittests",
+ "[CWD]/src/out/Debug/bin/run_test_support_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "test_support_unittests"
},
@@ -500,17 +481,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_tools_unittests",
+ "[CWD]/src/out/Debug/bin/run_tools_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "tools_unittests"
},
@@ -518,17 +498,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_video_engine_tests",
+ "[CWD]/src/out/Debug/bin/run_video_engine_tests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "video_engine_tests"
},
@@ -536,17 +515,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_voice_engine_unittests",
+ "[CWD]/src/out/Debug/bin/run_voice_engine_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "voice_engine_unittests"
},
@@ -554,17 +532,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_nonparallel_tests",
+ "[CWD]/src/out/Debug/bin/run_webrtc_nonparallel_tests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"900"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "webrtc_nonparallel_tests"
},
@@ -572,17 +549,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_perf_tests",
+ "[CWD]/src/out/Debug/bin/run_webrtc_perf_tests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"2700"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "webrtc_perf_tests"
},
@@ -590,24 +566,22 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_AppRTCDemoTest",
+ "[CWD]/src/out/Debug/bin/run_AppRTCDemoTest",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AppRTCDemoTest"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
+ "[CWD]/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test libjingle_peerconnection_android_unittest"
},
{
@@ -620,19 +594,17 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[CWD]/src/build/android/adb_logcat_printer.py",
"--output-path",
- "[SLAVE_BUILD]/src/out/Debug/full_log",
- "[SLAVE_BUILD]/src/out/logcat"
+ "[CWD]/src/out/Debug/full_log",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -641,7 +613,7 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"--force-version",
"4.7",
"-o",
@@ -650,10 +622,9 @@
"cp",
"-a",
"public-read",
- "[SLAVE_BUILD]/src/out/Debug/full_log",
+ "[CWD]/src/out/Debug/full_log",
"gs://chromium-android/logcat_dumps/android_dbg/1337"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_dbg/1337@@@"
@@ -661,32 +632,30 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
+ "[CWD]/src/third_party/android_platform/development/scripts/stack",
"--arch",
"arm",
"--more-info",
- "[SLAVE_BUILD]/src/out/Debug/full_log"
+ "[CWD]/src/out/Debug/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_with_logcat_dump"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/tombstones.py",
+ "[CWD]/src/build/android/tombstones.py",
"-a",
"-s",
"-w"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_for_tombstones"
},
@@ -695,9 +664,8 @@
"python",
"-u",
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
- "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
+ "[CWD]/src/out/Debug/test_logs/*.log"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698