| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
|
| index 0a82d3e1522ce88740996ff36800df90c9b6ae78..691552246fd1fc6d13ed0bb36c47de14bfa3fa64 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.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/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@@@@",
|
| @@ -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 component=static_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 component=static_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"
|
| },
|
| @@ -115,9 +111,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/src/out/Debug"
|
| + "[CWD]/src/out/Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -149,32 +144,29 @@
|
| "--build-number",
|
| "1337"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "extract build"
|
| },
|
| {
|
| "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"
|
| },
|
| @@ -185,29 +177,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": [
|
| @@ -309,18 +299,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"
|
| },
|
| @@ -335,31 +324,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\"]",
|
| "client.webrtc",
|
| "Android32 Tests (L Nexus5)(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"
|
| },
|
| @@ -367,17 +354,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"
|
| },
|
| @@ -385,17 +371,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"
|
| },
|
| @@ -403,17 +388,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"
|
| },
|
| @@ -421,17 +405,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"
|
| },
|
| @@ -439,17 +422,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"
|
| },
|
| @@ -457,17 +439,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"
|
| },
|
| @@ -475,17 +456,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"
|
| },
|
| @@ -493,17 +473,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"
|
| },
|
| @@ -511,17 +490,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"
|
| },
|
| @@ -529,17 +507,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"
|
| },
|
| @@ -547,17 +524,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"
|
| },
|
| @@ -565,17 +541,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"
|
| },
|
| @@ -583,24 +558,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"
|
| },
|
| {
|
| @@ -613,19 +586,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"
|
| },
|
| {
|
| @@ -634,17 +605,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/Debug/full_log",
|
| + "[CWD]/src/out/Debug/full_log",
|
| "gs://chromium-android/logcat_dumps/Android32 Tests (L Nexus5)(dbg)/1337"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android32 Tests (L Nexus5)(dbg)/1337@@@"
|
| @@ -652,32 +622,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"
|
| },
|
| @@ -686,9 +654,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@@@@",
|
|
|