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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1994703002: [Android] Default to test name as compile target for instrumentation tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_build.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_Android_Builder.json b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_build.json
similarity index 89%
copy from scripts/slave/recipes/chromium.expected/full_chromium_webkit_Android_Builder.json
copy to scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_build.json
index 0fb0c7fb97f8c39d425df9684590dff0b9bd5b47..a7a38e21ff77845eb4fc5df24007730c702b5e52 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_Android_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_build.json
@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "chromium.webkit",
+ "chromium.linux",
"--builder",
"Android Builder",
"--slave",
@@ -22,8 +22,6 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
- "--revision",
- "src/third_party/WebKit@HEAD",
"--force",
"--output_manifest"
],
@@ -36,8 +34,7 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -117,7 +114,7 @@
"-u",
"RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
"--platform",
- "linux-386",
+ "linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
@@ -141,7 +138,7 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra_internal/goma/client/linux-386 release",
+ "infra_internal/goma/client/linux-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -154,7 +151,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-386\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -165,6 +162,19 @@
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.4.10@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
@@ -173,7 +183,7 @@
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm test_isolation_mode=prepare use_goma=1",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -188,10 +198,11 @@
"--",
"--build-config-fs",
"Release",
+ "--use-src-side-runtest-py",
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.webkit\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+ "{\"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -204,13 +215,21 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
"/path/to/tmp/json"
],
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Android Tests\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instrumentation_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"blimp_test_apk\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -268,7 +287,7 @@
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
- "chromium.webkit",
+ "chromium.linux",
"-b",
"Android Builder",
"--config-file",
@@ -302,8 +321,6 @@
"[GOMA_CACHE]",
"--build-tool",
"ninja",
- "--build-data-dir",
- "[ROOT]/build_data_dir",
"--compiler",
"goma",
"--goma-jsonstatus",
@@ -313,9 +330,7 @@
"--goma-dir",
"[CACHE]/cipd/goma",
"--",
- "blink_heap_unittests_apk",
- "blink_tests",
- "webkit_unit_tests_apk"
+ "blimp_test_apk"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -339,15 +354,13 @@
"--target",
"Release",
"--build-url",
- "gs://chromium-webkit-archive/chromium.webkit/Android Builder",
+ "gs://chromium-linux-archive/chromium.linux/Android Builder",
"--build_revision",
"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "--gs-acl",
- "public-read",
"--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
"name": "package build"
},
@@ -356,7 +369,7 @@
"name": "trigger",
"trigger_specs": [
{
- "builder_name": "WebKit Android (Nexus4)",
+ "builder_name": "Android Tests",
"properties": {
"parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
"parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -376,7 +389,7 @@
}
],
"~followup_annotations": [
- "@@@STEP_TEXT@WebKit Android (Nexus4)@@@"
+ "@@@STEP_TEXT@Android Tests@@@"
]
},
{
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698