| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_n6.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_n6.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_n6.json
|
| index a01ea7e3d49c913902930517c2f3994222b18bec..480bea87c3fee13eb601ddef04bd3d2e52745356 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_n6.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_n6.json
|
| @@ -346,10 +346,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "audio_decoder_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_audio_decoder_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -358,7 +355,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "audio_decoder_unittests"
|
| @@ -367,10 +363,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "common_audio_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_common_audio_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -379,7 +372,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_audio_unittests"
|
| @@ -388,10 +380,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "common_video_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_common_video_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -400,7 +389,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_video_unittests"
|
| @@ -409,10 +397,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "modules_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_tests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -421,7 +406,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_tests"
|
| @@ -430,10 +414,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "modules_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -442,7 +423,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_unittests"
|
| @@ -451,10 +431,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "peerconnection_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_peerconnection_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -463,7 +440,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "peerconnection_unittests"
|
| @@ -472,10 +448,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "system_wrappers_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_system_wrappers_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -484,7 +457,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "system_wrappers_unittests"
|
| @@ -493,10 +465,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "test_support_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_test_support_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -505,7 +474,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_support_unittests"
|
| @@ -514,10 +482,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "tools_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_tools_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -526,7 +491,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "tools_unittests"
|
| @@ -535,10 +499,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "video_engine_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_video_engine_tests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -547,7 +508,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "video_engine_tests"
|
| @@ -556,10 +516,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "voice_engine_unittests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_voice_engine_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -568,7 +525,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "voice_engine_unittests"
|
| @@ -577,10 +533,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "webrtc_nonparallel_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_nonparallel_tests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -589,7 +542,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "webrtc_nonparallel_tests"
|
| @@ -598,10 +550,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "webrtc_perf_tests",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_perf_tests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| @@ -610,7 +559,6 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "webrtc_perf_tests"
|
|
|