Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json

Issue 1879283002: Revert of 🏨 Switch Android gtests to use generated wrapper scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c18f74517c068ad16d22da0b04a70fe1031d4457..a42a59a44a1dfe6bd0b3c2f1bd2d68d7fe9d7ac8 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
@@ -346,15 +346,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"
@@ -363,15 +367,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"
@@ -380,15 +388,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"
@@ -397,15 +409,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"
@@ -414,15 +430,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"
@@ -431,15 +451,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"
@@ -448,15 +472,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"
@@ -465,15 +493,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"
@@ -482,15 +514,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"
@@ -499,15 +535,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"
@@ -516,15 +556,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"
@@ -533,15 +577,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"
@@ -550,7 +598,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",
@@ -559,6 +610,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"

Powered by Google App Engine
This is Rietveld 408576698