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

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

Issue 666563007: Revert of 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: 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
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
index 841fc754b003b8d91eb5532a43f643c519f4bef2..c7e2f57b6ba974cd728a2fad3d7b416783685db8 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
@@ -106,27 +106,6 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "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\": \"linux_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@@@"
]
},
@@ -341,12 +320,6 @@
"python",
"-u",
"[SLAVE_BUILD]/src/testing/scripts/checkdeps.py",
- "--build-config-fs",
- "Release",
- "--paths",
- "{\"build\": \"[BUILD]\"}",
- "--properties",
- "{\"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
"run",
"--output",
"/path/to/tmp/json"
@@ -393,28 +366,31 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "[SLAVE_BUILD]/src/testing/scripts/telemetry_unittests.py",
- "--build-config-fs",
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/runtest.py",
+ "--target",
"Release",
- "--paths",
- "{\"build\": \"[BUILD]\"}",
- "--properties",
- "{\"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
- "run",
- "--output",
- "/path/to/tmp/json"
- ],
- "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@@@"
- ]
+ "--xvfb",
+ "--factory-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"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\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"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=linux_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",
+ "/path/to/tmp/json"
+ ],
+ "name": "telemetry_unittests (with patch)"
},
{
"allow_subannotations": true,
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698