| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| index 75f55ee29103342ecf2b182127b20a7b8d4060e8..0eef2eeb21ebba1fdd2c87bf6a3a612ee55921f5 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| @@ -27,6 +27,7 @@
|
| "--revision",
|
| "src@12345"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@Some step text@@@",
|
| @@ -53,6 +54,7 @@
|
| "RECIPE_MODULE[webrtc]/resources/cleanup_files.py",
|
| "[SLAVE_BUILD]/src/out"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "clean test output files"
|
| },
|
| {
|
| @@ -65,6 +67,7 @@
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -89,6 +92,7 @@
|
| "[DEPOT_TOOLS]/gclient.py",
|
| "runhooks"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "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",
|
| @@ -113,6 +117,7 @@
|
| "[BUILD]/goma",
|
| "--"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -125,6 +130,7 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -138,6 +144,7 @@
|
| "--adb-path",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -149,6 +156,7 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -189,6 +197,7 @@
|
| "-t",
|
| "Release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -205,6 +214,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -221,6 +231,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -237,6 +248,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -253,6 +265,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -269,6 +282,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -285,6 +299,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -301,6 +316,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -317,6 +333,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -333,6 +350,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -349,6 +367,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -365,6 +384,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -381,6 +401,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -392,6 +413,7 @@
|
| "[SLAVE_BUILD]/src/out/Release/apks/AppRTCDemo.apk",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
|
| },
|
| @@ -408,6 +430,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Instrumentation test AppRTCDemoTest"
|
| },
|
| {
|
| @@ -421,6 +444,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Instrumentation test libjingle_peerconnection_android_unittest"
|
| },
|
| {
|
| @@ -433,6 +457,7 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -442,6 +467,7 @@
|
| "\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": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|