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 4fda110e632b3673984c0e59c866ddae5a28308c..409acffcfd9f2d2d7b9f6aa8c03c10f596d12ec2 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 |
@@ -285,17 +285,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" |
@@ -304,18 +300,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" |
@@ -324,17 +315,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" |
@@ -343,18 +330,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" |
@@ -363,17 +345,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" |
@@ -382,17 +360,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" |
@@ -401,17 +375,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" |
@@ -420,17 +390,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" |
@@ -439,18 +405,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" |
@@ -459,18 +420,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" |
@@ -479,17 +435,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" |
@@ -498,17 +450,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" |