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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_swarming.json

Issue 666023004: Use src-side launcher for telemetry_unittests in chromium_trybot recipe (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: rebase & add TODO Created 6 years, 2 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_mac_mac_chromium_rel_swarming.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_swarming.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_swarming.json
index 91c39c7b0fe6d04e757d2ac16e2928a94ff8281f..de5f3359a0dbdd6c83c0eb34c08c26345fbd3b22 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_swarming.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_swarming.json
@@ -127,6 +127,27 @@
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "--output",
+ "/path/to/tmp/json",
+ "--",
+ "--build-config-fs",
+ "Release",
+ "--paths",
+ "{\"build\": \"[BUILD]\"}",
+ "--properties",
+ "{\"buildername\": \"mac_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
+ ],
+ "name": "get compile targets for scripts",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[DEPOT_TOOLS]/gclient.py",
"runhooks"
],
@@ -164,6 +185,12 @@
"python",
"-u",
"[SLAVE_BUILD]/src/testing/scripts/checkdeps.py",
+ "--build-config-fs",
+ "Release",
+ "--paths",
+ "{\"build\": \"[BUILD]\"}",
+ "--properties",
+ "{\"buildername\": \"mac_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
"run",
"--output",
"/path/to/tmp/json"
@@ -178,30 +205,28 @@
]
},
{
- "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/runtest.py",
- "--target",
+ "[SLAVE_BUILD]/src/testing/scripts/telemetry_unittests.py",
+ "--build-config-fs",
"Release",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"mac_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.mac\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"mac_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.mac\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=gtest",
- "--test-type=telemetry_unittests",
- "--builder-name=mac_chromium_rel_swarming",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "[SLAVE_BUILD]/src/tools/telemetry/run_tests",
- "--browser=release",
- "--retry-limit=3",
- "--write-full-results-to",
+ "--paths",
+ "{\"build\": \"[BUILD]\"}",
+ "--properties",
+ "{\"buildername\": \"mac_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
+ "run",
+ "--output",
"/path/to/tmp/json"
],
- "name": "telemetry_unittests (with patch)"
+ "name": "telemetry_unittests (with patch)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
},
{
"allow_subannotations": true,

Powered by Google App Engine
This is Rietveld 408576698