aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bot_update: add depot_tools to PATH so that e.g. apply_issue can be found (reland #1)

Browse Source 
Original attempt: https://codereview.chromium.org/1660943002

Now adds depot_tools at the end of PATH to avoid issues with python
on Windows.

TBR=jochen

BUG=437264

Review URL: https://codereview.chromium.org/1661953002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298562 0039d316-1c4b-4281-b951-d872f2087c98
changes/01/332501/1
phajdan.jr@chromium.org 10 years ago
parent fc064509b0
commit 0097973a0e
17 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File

4
recipe_modules/bot_update/api.py
Unescape Escape View File

@ -57,6 +57,10 @@ class BotUpdateApi(recipe_api.RecipeApi):
assert isinstance(cmd, (list, tuple))
bot_update_path = self.resource('bot_update.py')
kwargs.setdefault('infra_step', True)
kwargs.setdefault('env', {})
kwargs['env'].setdefault('PATH', '%(PATH)s')
kwargs['env']['PATH'] = self.m.path.pathsep.join([
kwargs['env']['PATH'], str(self._module.PACKAGE_DIRECTORY)])
return self.m.python(name, bot_update_path, cmd, **kwargs)
@property

3
recipe_modules/bot_update/example.expected/basic.json
Unescape Escape View File

@ -24,6 +24,9 @@
"src@abc"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update (without patch)",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/basic_output_manifest.json
Unescape Escape View File

@ -25,6 +25,9 @@
"--output_manifest"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
Unescape Escape View File

@ -25,6 +25,9 @@
"--with_branch_heads"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update - with branch heads",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/clobber.json
Unescape Escape View File

@ -25,6 +25,9 @@
"--clobber"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",

3
recipe_modules/bot_update/example.expected/forced.json
Unescape Escape View File

@ -25,6 +25,9 @@
"--force"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/no_shallow.json
Unescape Escape View File

@ -25,6 +25,9 @@
"--no_shallow"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",

3
recipe_modules/bot_update/example.expected/off.json
Unescape Escape View File

@ -24,6 +24,9 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",

3
recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
Unescape Escape View File

@ -24,6 +24,9 @@
"src@revision"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",

3
recipe_modules/bot_update/example.expected/svn_mode.json
Unescape Escape View File

@ -25,6 +25,9 @@
"--force"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/trychange.json
Unescape Escape View File

@ -26,6 +26,9 @@
"+refs/change/1/2/333"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/trychange_oauth2.json
Unescape Escape View File

@ -28,6 +28,9 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/tryjob.json
Unescape Escape View File

@ -26,6 +26,9 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/tryjob_fail.json
Unescape Escape View File

@ -26,6 +26,9 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"step returned non-zero exit code: 1",

3
recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
Unescape Escape View File

@ -26,6 +26,9 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
Unescape Escape View File

@ -26,6 +26,9 @@
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

3
recipe_modules/bot_update/example.expected/tryjob_v8.json
Unescape Escape View File

@ -28,6 +28,9 @@
"src/v8@abc"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",

Write Preview
Loading…
Cancel
Save