| Index: scripts/slave/recipes/crashpad/continuous.expected/crashpad_mac_dbg_clobber.json
|
| diff --git a/scripts/slave/recipes/crashpad/continuous.expected/crashpad_mac_dbg_clobber.json b/scripts/slave/recipes/crashpad/continuous.expected/crashpad_mac_dbg_clobber.json
|
| index adededca3dd6374446628bfe91f981db80b56db2..70b16484d0cae6ae1d2e931c97e1e17c5c5b2137 100644
|
| --- a/scripts/slave/recipes/crashpad/continuous.expected/crashpad_mac_dbg_clobber.json
|
| +++ b/scripts/slave/recipes/crashpad/continuous.expected/crashpad_mac_dbg_clobber.json
|
| @@ -3,45 +3,38 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "config",
|
| + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'crashpad', 'url': 'https://chromium.googlesource.com/crashpad/crashpad.git'}]"
|
| - ],
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient setup"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "sync",
|
| - "--verbose",
|
| - "--with_branch_heads",
|
| - "--nohooks",
|
| - "-j8",
|
| - "--reset",
|
| - "--force",
|
| - "--upstream",
|
| - "--no-nag-max",
|
| - "--delete_unversioned_trees",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'crashpad', 'url': 'https://chromium.googlesource.com/crashpad/crashpad.git'}]",
|
| + "--patch_root",
|
| + "crashpad",
|
| + "--revision_mapping_file",
|
| + "{}",
|
| + "--git-cache-dir",
|
| + "[GIT_CACHE]",
|
| + "--output_json",
|
| + "/path/to/tmp/json",
|
| + "--revision",
|
| + "crashpad@HEAD",
|
| + "--output_manifest"
|
| ],
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| - "name": "gclient sync",
|
| + "name": "bot_update",
|
| "~followup_annotations": [
|
| + "@@@STEP_TEXT@Some step text@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"crashpad/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e6ebda0f8dc589a150c612132e67916df288f343\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@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@ \"crashpad\": \"HEAD\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {}, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"crashpad\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"properties\": {}, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"root\": \"crashpad\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -50,38 +43,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "recurse",
|
| - "git",
|
| - "config",
|
| - "user.name",
|
| - "local_bot"
|
| - ],
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient recurse (git config user.name)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "recurse",
|
| - "git",
|
| - "config",
|
| - "user.email",
|
| - "local_bot@example.com"
|
| - ],
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient recurse (git config user.email)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| "[SLAVE_BUILD]/crashpad/out"
|
| ],
|
|
|