Index: scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json |
diff --git a/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json b/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json |
index acf1eaa65fae54c30a86a5ca48d22e98acb92c34..3ecf8b0b7f2b07dc45b9a0abaaa860aad9652c8c 100644 |
--- a/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json |
+++ b/scripts/slave/recipes/emulator.expected/Android_Tests__x86_emulator__test_fail.json |
@@ -184,17 +184,29 @@ |
"[BUILD]/goma", |
"--", |
"android_webview_unittests_apk", |
+ "bin/run_android_webview_unittests", |
"base_unittests_apk", |
+ "bin/run_base_unittests", |
"cc_unittests_apk", |
+ "bin/run_cc_unittests", |
"components_unittests_apk", |
+ "bin/run_components_unittests", |
"events_unittests_apk", |
+ "bin/run_events_unittests", |
"gl_tests_apk", |
+ "bin/run_gl_tests", |
"ipc_tests_apk", |
+ "bin/run_ipc_tests", |
"skia_unittests_apk", |
+ "bin/run_skia_unittests", |
"sql_unittests_apk", |
+ "bin/run_sql_unittests", |
"sync_unit_tests_apk", |
+ "bin/run_sync_unit_tests", |
"ui_android_unittests_apk", |
- "ui_touch_selection_unittests_apk" |
+ "bin/run_ui_android_unittests", |
+ "ui_touch_selection_unittests_apk", |
+ "bin/run_ui_touch_selection_unittests" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
@@ -285,17 +297,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "android_webview_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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", |
@@ -308,18 +316,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "base_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_base_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "--isolate_file_path=[SLAVE_BUILD]/src/base/base_unittests.isolate" |
+ "--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": "base_unittests" |
@@ -328,17 +331,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "cc_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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" |
@@ -347,18 +346,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "components_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_components_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "--isolate_file_path=[SLAVE_BUILD]/src/components/components_unittests.isolate" |
+ "--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": "components_unittests" |
@@ -367,17 +361,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "events_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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" |
@@ -386,17 +376,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "gl_tests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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" |
@@ -405,17 +391,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "ipc_tests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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" |
@@ -424,17 +406,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "skia_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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" |
@@ -443,18 +421,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "sql_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_sql_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "--isolate_file_path=[SLAVE_BUILD]/src/sql/sql_unittests.isolate" |
+ "--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": "sql_unittests" |
@@ -463,18 +436,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "sync_unit_tests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_sync_unit_tests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
- "--verbose", |
- "--isolate_file_path=[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate" |
+ "--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": "sync_unit_tests" |
@@ -483,17 +451,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "ui_android_unittests", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_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" |
@@ -502,17 +466,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "ui_touch_selection_unittests", |
+ "[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": { |
- "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" |