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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_basic.json

Issue 1885163002: Revert of Reland 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
« no previous file with comments | « scripts/slave/recipes/emulator.py ('k') | scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_basic.json
diff --git a/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_basic.json b/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_basic.json
index b362957876a9441dbd7da9b68ac0293f62a20020..4fda110e632b3673984c0e59c866ddae5a28308c 100644
--- a/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_basic.json
+++ b/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_basic.json
@@ -183,29 +183,17 @@
"--goma-dir",
"[BUILD]/goma",
"--",
- "android_webview_unittests",
"android_webview_unittests_apk",
- "base_unittests",
"base_unittests_apk",
- "cc_unittests",
"cc_unittests_apk",
- "components_unittests",
"components_unittests_apk",
- "events_unittests",
"events_unittests_apk",
- "gl_tests",
"gl_tests_apk",
- "ipc_tests",
"ipc_tests_apk",
- "skia_unittests",
"skia_unittests_apk",
- "sql_unittests",
"sql_unittests_apk",
- "sync_unit_tests",
"sync_unit_tests_apk",
- "ui_android_unittests",
"ui_android_unittests_apk",
- "ui_touch_selection_unittests",
"ui_touch_selection_unittests_apk"
],
"cwd": "[SLAVE_BUILD]",
@@ -297,13 +285,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_android_webview_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "android_webview_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "android_webview_unittests"
@@ -312,13 +304,18 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_base_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "base_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose",
+ "--isolate_file_path=[SLAVE_BUILD]/src/base/base_unittests.isolate"
+ ],
+ "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": "base_unittests"
@@ -327,13 +324,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_cc_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "cc_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "cc_unittests"
@@ -342,13 +343,18 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_components_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "components_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose",
+ "--isolate_file_path=[SLAVE_BUILD]/src/components/components_unittests.isolate"
+ ],
+ "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": "components_unittests"
@@ -357,13 +363,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_events_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "events_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "events_unittests"
@@ -372,13 +382,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_gl_tests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "gl_tests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "gl_tests"
@@ -387,13 +401,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_ipc_tests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "ipc_tests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "ipc_tests"
@@ -402,13 +420,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_skia_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "skia_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "skia_unittests"
@@ -417,13 +439,18 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_sql_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "sql_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose",
+ "--isolate_file_path=[SLAVE_BUILD]/src/sql/sql_unittests.isolate"
+ ],
+ "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": "sql_unittests"
@@ -432,13 +459,18 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_sync_unit_tests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "sync_unit_tests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose",
+ "--isolate_file_path=[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate"
+ ],
+ "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": "sync_unit_tests"
@@ -447,13 +479,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_ui_android_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "ui_android_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "ui_android_unittests"
@@ -462,13 +498,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_ui_touch_selection_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "ui_touch_selection_unittests",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--verbose"
+ ],
+ "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": "ui_touch_selection_unittests"
« no previous file with comments | « scripts/slave/recipes/emulator.py ('k') | scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698