| 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 aa82601ac0c8afb9224fc4010aacf260e16a5691..f829d723a28a43ec7d6aa700f29294644a8b2dd1 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 = '[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']",
|
| + "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']",
|
| "--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"
|
| },
|
| {
|
| @@ -75,11 +77,12 @@
|
| "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",
|
| - "[CWD]/src/out/Debug/debug_info_dumps",
|
| - "[CWD]/src/out/Debug/test_logs",
|
| - "[CWD]/src/out/build_product.zip",
|
| - "[CWD]/src"
|
| + "[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": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -104,11 +107,12 @@
|
| "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='[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]"
|
| + "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]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -127,9 +131,9 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[CWD]/src",
|
| + "[SLAVE_BUILD]/src",
|
| "--goma-cache-dir",
|
| - "[ROOT]/b/build/slave/goma_cache",
|
| + "[GOMA_CACHE]",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -139,14 +143,15 @@
|
| "--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",
|
| "--"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile",
|
| "~followup_annotations": [
|
| @@ -158,23 +163,25 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/symlink.py",
|
| + "[SLAVE_BUILD]/src/build/symlink.py",
|
| "-f",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[SLAVE_BUILD]/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",
|
| "--",
|
| - "[CWD]/src/build/android/adb_logcat_monitor.py",
|
| - "[CWD]/src/out/logcat"
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| + "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -185,27 +192,29 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| "--adb-path",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "authorize_adb_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
|
| + "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| - "[ROOT]/b/build/site_config/.known_devices"
|
| + "[BUILD]/site_config/.known_devices"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status_check",
|
| "~followup_annotations": [
|
| @@ -307,17 +316,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/provision_devices.py",
|
| + "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| "-t",
|
| "Debug",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| @@ -332,29 +342,31 @@
|
| "/tmp/device_monitor.pid",
|
| "--",
|
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "tryserver.webrtc",
|
| "android_dbg",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json"
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_audio_decoder_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_audio_decoder_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "audio_decoder_unittests"
|
| },
|
| @@ -362,16 +374,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_common_audio_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_common_audio_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_audio_unittests"
|
| },
|
| @@ -379,16 +392,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_common_video_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_common_video_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_video_unittests"
|
| },
|
| @@ -396,16 +410,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_modules_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_tests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_tests"
|
| },
|
| @@ -413,16 +428,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_modules_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_unittests"
|
| },
|
| @@ -430,16 +446,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_peerconnection_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_peerconnection_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "peerconnection_unittests"
|
| },
|
| @@ -447,16 +464,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_system_wrappers_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_system_wrappers_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "system_wrappers_unittests"
|
| },
|
| @@ -464,16 +482,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_test_support_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_test_support_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_support_unittests"
|
| },
|
| @@ -481,16 +500,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_tools_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_tools_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "tools_unittests"
|
| },
|
| @@ -498,16 +518,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_video_engine_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_video_engine_tests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "video_engine_tests"
|
| },
|
| @@ -515,16 +536,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_voice_engine_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_voice_engine_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "voice_engine_unittests"
|
| },
|
| @@ -532,16 +554,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_webrtc_nonparallel_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_nonparallel_tests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| @@ -549,16 +572,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_webrtc_perf_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_perf_tests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "webrtc_perf_tests"
|
| },
|
| @@ -566,22 +590,24 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_AppRTCDemoTest",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_AppRTCDemoTest",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Instrumentation test AppRTCDemoTest"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Instrumentation test libjingle_peerconnection_android_unittest"
|
| },
|
| {
|
| @@ -594,17 +620,19 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/adb_logcat_printer.py",
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[CWD]/src/out/Debug/full_log",
|
| - "[CWD]/src/out/logcat"
|
| + "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| + "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -613,7 +641,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[ROOT]/b/depot_tools/gsutil.py",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| "--force-version",
|
| "4.7",
|
| "-o",
|
| @@ -622,9 +650,10 @@
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[CWD]/src/out/Debug/full_log",
|
| + "[SLAVE_BUILD]/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@@@"
|
| @@ -632,30 +661,32 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[CWD]/src/third_party/android_platform/development/scripts/stack",
|
| + "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[CWD]/src/out/Debug/full_log"
|
| + "[SLAVE_BUILD]/src/out/Debug/full_log"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| {
|
| "cmd": [
|
| - "[CWD]/src/build/android/tombstones.py",
|
| + "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -664,8 +695,9 @@
|
| "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",
|
| - "[CWD]/src/out/Debug/test_logs/*.log"
|
| + "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|