Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
index 4cfedec246811ee7f921f88a71e89badf99f802b..99f1fed7d444650bc92702018a5c63b2b26c7db4 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.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'}]\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", |
"--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" |
}, |
{ |
@@ -71,12 +69,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/Release/debug_info_dumps", |
- "[SLAVE_BUILD]/src/out/Release/test_logs", |
- "[SLAVE_BUILD]/src/out/build_product.zip", |
- "[SLAVE_BUILD]/src" |
+ "[CWD]/src/out/Release/debug_info_dumps", |
+ "[CWD]/src/out/Release/test_logs", |
+ "[CWD]/src/out/build_product.zip", |
+ "[CWD]/src" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "clean local files", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -101,12 +98,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 asan=1 clang=1 component=shared_library 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 asan=1 clang=1 component=shared_library 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" |
}, |
@@ -117,14 +113,13 @@ |
"-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", |
- "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": "clang_revision", |
"~followup_annotations": [ |
@@ -149,9 +144,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", |
@@ -161,13 +156,12 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/build/goma", |
"--" |
], |
- "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": [ |
@@ -179,25 +173,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" |
}, |
@@ -208,29 +200,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": [ |
@@ -332,33 +322,31 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/provision_devices.py", |
+ "[CWD]/src/build/android/provision_devices.py", |
"-t", |
"Release", |
"--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" |
}, |
{ |
"cmd": [ |
- "[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh", |
+ "[CWD]/src/tools/android/asan/third_party/asan_device_setup.sh", |
"--lib", |
- "[SLAVE_BUILD]/src/third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/lib/linux/libclang_rt.asan-arm-android.so", |
+ "[CWD]/src/third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/lib/linux/libclang_rt.asan-arm-android.so", |
"--device", |
"07a00ca4" |
], |
- "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": "asan_device_setup.sh 07a00ca4" |
}, |
@@ -373,32 +361,30 @@ |
"/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\"]", |
"client.webrtc.fyi", |
"Android32 ASan (L Nexus6)", |
"--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/Release/bin/run_audio_decoder_unittests", |
+ "[CWD]/src/out/Release/bin/run_audio_decoder_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -406,18 +392,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_common_audio_unittests", |
+ "[CWD]/src/out/Release/bin/run_common_audio_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -425,18 +410,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_common_video_unittests", |
+ "[CWD]/src/out/Release/bin/run_common_video_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -444,18 +428,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_modules_tests", |
+ "[CWD]/src/out/Release/bin/run_modules_tests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -463,18 +446,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_modules_unittests", |
+ "[CWD]/src/out/Release/bin/run_modules_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -482,18 +464,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_peerconnection_unittests", |
+ "[CWD]/src/out/Release/bin/run_peerconnection_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -501,18 +482,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_system_wrappers_unittests", |
+ "[CWD]/src/out/Release/bin/run_system_wrappers_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -520,18 +500,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_test_support_unittests", |
+ "[CWD]/src/out/Release/bin/run_test_support_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -539,18 +518,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_tools_unittests", |
+ "[CWD]/src/out/Release/bin/run_tools_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -558,18 +536,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_video_engine_tests", |
+ "[CWD]/src/out/Release/bin/run_video_engine_tests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -577,18 +554,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_voice_engine_unittests", |
+ "[CWD]/src/out/Release/bin/run_voice_engine_unittests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -596,18 +572,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_webrtc_nonparallel_tests", |
+ "[CWD]/src/out/Release/bin/run_webrtc_nonparallel_tests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -615,18 +590,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_webrtc_perf_tests", |
+ "[CWD]/src/out/Release/bin/run_webrtc_perf_tests", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--verbose", |
"--tool=asan", |
"-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" |
}, |
@@ -634,26 +608,24 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_AppRTCDemoTest", |
+ "[CWD]/src/out/Release/bin/run_AppRTCDemoTest", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--tool=asan", |
"--verbose" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Instrumentation test AppRTCDemoTest" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_libjingle_peerconnection_android_unittest", |
+ "[CWD]/src/out/Release/bin/run_libjingle_peerconnection_android_unittest", |
"--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "[CWD]/src/out/bad_devices.json", |
"--tool=asan", |
"--verbose" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Instrumentation test libjingle_peerconnection_android_unittest" |
}, |
{ |
@@ -666,19 +638,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/Release/full_log", |
- "[SLAVE_BUILD]/src/out/logcat" |
+ "[CWD]/src/out/Release/full_log", |
+ "[CWD]/src/out/logcat" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "logcat_dump" |
}, |
{ |
@@ -687,17 +657,16 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"--force-version", |
"4.7", |
"-o", |
"GSUtil:parallel_composite_upload_threshold=50M", |
"----", |
"cp", |
- "[SLAVE_BUILD]/src/out/Release/full_log", |
+ "[CWD]/src/out/Release/full_log", |
"gs://chromium-android/logcat_dumps/Android32 ASan (L Nexus6)/1337" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android32 ASan (L Nexus6)/1337@@@" |
@@ -705,32 +674,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/Release/full_log" |
+ "[CWD]/src/out/Release/full_log" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release", |
"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/Release", |
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release", |
"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" |
}, |
@@ -739,9 +706,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/Release/test_logs/*.log" |
+ "[CWD]/src/out/Release/test_logs/*.log" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "test_report", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |