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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.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
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 fc6fd237cd604ec572f5a18601c6e964b329d5e9..63c3bbce5557bff92cf5b1b75a48bef43a058a0b 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
@@ -227,31 +227,23 @@
"@@@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@ \"blink_heap_unittests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_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@ \"blink_heap_unittests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_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@ \"blink_heap_unittests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_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@ \"blink_heap_unittests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests_apk\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"blink_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests_apk\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ]@@@",
"@@@STEP_LOG_LINE@analyze_details@}@@@",
@@ -354,10 +346,8 @@
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--",
- "blink_heap_unittests",
"blink_heap_unittests_apk",
"blink_tests",
- "webkit_unit_tests",
"webkit_unit_tests_apk"
],
"cwd": "[SLAVE_BUILD]",
@@ -612,16 +602,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)"
@@ -630,16 +625,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)"

Powered by Google App Engine
This is Rietveld 408576698