| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| index fdd4eb2ebfc4d4f2f45d9af08f5577f3b84c16c7..1f360853667fa031dcefb66fb0b0f6640d5e0130 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| @@ -287,29 +287,21 @@
|
| "@@@STEP_LOG_LINE@analyze_details@{@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_blink_heap_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_webkit_unit_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests_apk\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_blink_heap_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_webkit_unit_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests_apk\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_blink_heap_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_webkit_unit_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests_apk\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_blink_heap_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"bin/run_webkit_unit_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests_apk\"@@@",
|
| @@ -414,8 +406,6 @@
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| "--",
|
| - "bin/run_blink_heap_unittests",
|
| - "bin/run_webkit_unit_tests",
|
| "blink_heap_unittests_apk",
|
| "blink_tests",
|
| "webkit_unit_tests_apk"
|
| @@ -672,16 +662,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_blink_heap_unittests",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "blink_heap_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| + "--release",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "blink_heap_unittests (with patch)"
|
| @@ -690,16 +685,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_webkit_unit_tests",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "gtest",
|
| + "-s",
|
| + "webkit_unit_tests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| + "--release",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "webkit_unit_tests (with patch)"
|
|
|