Index: recipe_modules/gclient/example.expected/tryserver.json |
diff --git a/recipe_modules/gclient/example.expected/tryserver.json b/recipe_modules/gclient/example.expected/tryserver.json |
index 8b17594c03c3bd72022c6a41932a34cf2914a50a..13889c24e57279f218e9b83a25ce1131f51d9510 100644 |
--- a/recipe_modules/gclient/example.expected/tryserver.json |
+++ b/recipe_modules/gclient/example.expected/tryserver.json |
@@ -87,7 +87,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"config", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" |
], |
"cwd": "[SLAVE_BUILD]/src/third_party", |
"env": { |
@@ -99,24 +99,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILD]/scripts/slave/gclient_safe_revert.py", |
- ".", |
- "[DEPOT_TOOLS]/gclient" |
- ], |
- "cwd": "[SLAVE_BUILD]/src/third_party", |
- "name": "[spec: WebKit] gclient revert" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"sync", |
+ "--verbose", |
+ "--with_branch_heads", |
"--nohooks", |
+ "-j8", |
+ "--reset", |
"--force", |
- "--verbose", |
+ "--upstream", |
+ "--no-nag-max", |
"--delete_unversioned_trees", |
- "--with_branch_heads", |
"--revision", |
"third_party/WebKit@123", |
"--output-json", |
@@ -131,21 +124,55 @@ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"WebKit/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 241198@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 248087@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@", |
- "@@@SET_BUILD_PROPERTY@got_blatley_revision@248087@@@" |
+ "@@@SET_BUILD_PROPERTY@got_blatley_revision@\"5e800497199d615131a76cd10651e74d7c8a0962\"@@@" |
] |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
+ "recurse", |
+ "git", |
+ "config", |
+ "user.name", |
+ "local_bot" |
+ ], |
+ "cwd": "[SLAVE_BUILD]/src/third_party", |
+ "env": { |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "[spec: WebKit] 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" |
+ ], |
+ "cwd": "[SLAVE_BUILD]/src/third_party", |
+ "env": { |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "[spec: WebKit] gclient recurse (git config user.email)" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n", |
"[SLAVE_BUILD]" |
], |