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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_compile_targets.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
Index: scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_compile_targets.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_compile_targets.json b/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_compile_targets.json
index 1fa5fcc4cf97248ab179356ec18de40a518f8628..66bd40a5c358b738422bb2ff0fbf3b877b91c814 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_compile_targets.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_compile_targets.json
@@ -113,27 +113,6 @@
"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\", \"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",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
"/path/to/tmp/json"
@@ -292,12 +271,6 @@
"python",
"-u",
"[SLAVE_BUILD]/src/testing/scripts/checkdeps.py",
- "--build-config-fs",
- "Release",
- "--paths",
- "{\"build\": \"[BUILD]\"}",
- "--properties",
- "{\"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
"run",
"--output",
"/path/to/tmp/json"
@@ -342,6 +315,33 @@
"@@@STEP_LOG_LINE@json.output@[]@@@",
"@@@STEP_LOG_END@json.output@@@"
]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/runtest.py",
+ "--target",
+ "Release",
+ "--xvfb",
+ "--factory-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"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\", \"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",
+ "--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,

Powered by Google App Engine
This is Rietveld 408576698