Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
index 683ce8854055fe044b2ada7e7a2950ecd06db176..b75832ac32115e1c2da9ca3b51c7ffa83ed9499f 100644 |
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json |
@@ -344,15 +344,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_audio_decoder_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "audio_decoder_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -361,15 +365,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_common_audio_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "common_audio_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -378,15 +386,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_common_video_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "common_video_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -395,15 +407,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_tests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "modules_tests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -412,15 +428,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "modules_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -429,15 +449,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_peerconnection_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "peerconnection_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -446,15 +470,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_system_wrappers_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "system_wrappers_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -463,15 +491,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_test_support_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "test_support_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -480,15 +512,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_tools_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "tools_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -497,15 +533,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_video_engine_tests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "video_engine_tests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -514,15 +554,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_voice_engine_unittests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "voice_engine_unittests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -531,15 +575,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_nonparallel_tests", |
- "--blacklist-file", |
- "[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "-t", |
- "900" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "webrtc_nonparallel_tests", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--verbose", |
+ "-t", |
+ "900" |
+ ], |
+ "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" |
@@ -548,7 +596,10 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_perf_tests", |
+ "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "webrtc_perf_tests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
@@ -557,6 +608,7 @@ |
], |
"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" |