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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Android_Client.json

Issue 2357343004: chromium_tests: automatically set up test genrators (Closed)
Patch Set: rebase Created 4 years, 3 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.expected/full_chromium_fyi_Blimp_Android_Client.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Android_Client.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Android_Client.json
index 048282129cb27c253422f7441b9d4047983ec9b0..e6fa091132c253e5e6233839252a8309a47b4635 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Android_Client.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Android_Client.json
@@ -306,6 +306,17 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "--build-dir",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/out/Release",
+ "--clean-isolated-files"
+ ],
+ "name": "clean isolated files"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILDER_CACHE]/Blimp_Android_Client/src/tools/mb/mb.py",
"gen",
"-m",
@@ -316,13 +327,19 @@
"[BUILDER_CACHE]/Blimp_Android_Client/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
+ "--swarming-targets-file",
+ "browser_tests_apk\n",
"//out/Release"
],
"cwd": "[BUILDER_CACHE]/Blimp_Android_Client/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "generate_build_files"
+ "name": "generate_build_files",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests_apk@@@",
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
+ ]
},
{
"cmd": [
@@ -360,7 +377,8 @@
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--"
+ "--",
+ "browser_tests_apk_run"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -373,6 +391,130 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/tools/determinism/remove_build_metadata.py",
+ "--build-dir",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/out/Release"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "remove_build_metadata"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/tools/swarming_client",
+ "batcharchive",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--verbose",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/out/Release/browser_tests_apk.isolated.gen.json"
+ ],
+ "name": "isolate tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests_apk\": \"[dummy hash for browser_tests_apk]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "--build-dir",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/out/Release",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "cwd": "[BUILDER_CACHE]/Blimp_Android_Client",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Blimp_Android_Client/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Blimp_Android_Client/src/build/android:%(PATH)s"
+ },
+ "name": "find isolated tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
+ "browser_tests_apk"
+ ],
+ "cwd": "[BUILDER_CACHE]/Blimp_Android_Client",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Blimp_Android_Client/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Blimp_Android_Client/src/build/android:%(PATH)s"
+ },
+ "name": "[error] browser_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
+ "browser_tests"
+ ],
+ "cwd": "[BUILDER_CACHE]/Blimp_Android_Client",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Blimp_Android_Client/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Blimp_Android_Client/src/build/android:%(PATH)s"
+ },
+ "name": "[collect error] browser_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
+ "[BUILDER_CACHE]/Blimp_Android_Client/src/out/Release/test_logs/*.log"
+ ],
+ "cwd": "[BUILDER_CACHE]/Blimp_Android_Client",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Blimp_Android_Client/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Blimp_Android_Client/src/build/android:%(PATH)s"
+ },
+ "name": "test_report",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print l@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0

Powered by Google App Engine
This is Rietveld 408576698