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

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

Issue 1372133003: Revert of chromium_tests: raise infra failure when no compile targets are specified (patchset #1 id: (Closed) Base URL: http://src.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 5 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_Mac_OpenSSL.json
===================================================================
--- scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mac_OpenSSL.json (revision 296915)
+++ scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mac_OpenSSL.json (working copy)
@@ -118,22 +118,45 @@
"name": "cleanup_temp"
},
{
+ "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "import sys; sys.exit(1)"
+ "[BUILD]/scripts/slave/clang_revision.py",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--output-json",
+ "/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "compile",
+ "name": "clang_revision",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@Misconfigured bot: no compile targets@@@",
- "@@@STEP_FAILURE@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
- "name": "$final_result",
- "reason": "Step('compile') failed with return_code 1",
- "status_code": 1
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/compile.py",
+ "--target",
+ "Release",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--build-tool",
+ "ninja",
+ "--compiler",
+ "goma-clang",
+ "--goma-dir",
+ "[BUILD]/goma",
+ "--",
+ "All",
+ "chromium_builder_tests"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "compile"
}
]

Powered by Google App Engine
This is Rietveld 408576698