leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildman: Permit branch names with an embedded '/'

Browse Source 
At present buildman naively uses the branch name as part of its directory
path, which causes problems if the name has an embedded '/'.

Replace these with '_' to fix the problem.

Reported-by: Steve Rae <srae@broadcom.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-09-05 19:00:22 -06:00
parent 930c8d4ad8
commit f7582ce849
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/buildman/control.py
View File

@ -209,7 +209,7 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
# Create a new builder with the selected options # Create a new builder with the selected options
if options.branch: if options.branch:
dirname = options.branch dirname = options.branch.replace('/', '_')
else: else:
dirname = 'current' dirname = 'current'
output_dir = os.path.join(options.output_dir, dirname) output_dir = os.path.join(options.output_dir, dirname)

17
tools/buildman/func_test.py
View File

@ -199,6 +199,8 @@ class TestFunctional(unittest.TestCase):
# Map of [board, commit] to error messages # Map of [board, commit] to error messages
self._error = {} self._error = {}
self._test_branch = TEST_BRANCH
# Avoid sending any output and clear all terminal output # Avoid sending any output and clear all terminal output
terminal.SetPrintTestMode() terminal.SetPrintTestMode()
terminal.GetPrintTestLines() terminal.GetPrintTestLines()
@ -252,10 +254,10 @@ class TestFunctional(unittest.TestCase):
def _HandleCommandGitLog(self, args): def _HandleCommandGitLog(self, args):
if '-n0' in args: if '-n0' in args:
return command.CommandResult(return_code=0) return command.CommandResult(return_code=0)
elif args[-1] == 'upstream/master..%s' % TEST_BRANCH: elif args[-1] == 'upstream/master..%s' % self._test_branch:
return command.CommandResult(return_code=0, stdout=commit_shortlog) return command.CommandResult(return_code=0, stdout=commit_shortlog)
elif args[:3] == ['--no-color', '--no-decorate', '--reverse']: elif args[:3] == ['--no-color', '--no-decorate', '--reverse']:
if args[-1] == TEST_BRANCH: if args[-1] == self._test_branch:
count = int(args[3][2:]) count = int(args[3][2:])
return command.CommandResult(return_code=0, return command.CommandResult(return_code=0,
stdout=''.join(commit_log[:count])) stdout=''.join(commit_log[:count]))
@ -270,9 +272,9 @@ class TestFunctional(unittest.TestCase):
return command.CommandResult(return_code=0) return command.CommandResult(return_code=0)
elif config.startswith('branch.badbranch'): elif config.startswith('branch.badbranch'):
return command.CommandResult(return_code=1) return command.CommandResult(return_code=1)
elif config == 'branch.%s.remote' % TEST_BRANCH: elif config == 'branch.%s.remote' % self._test_branch:
return command.CommandResult(return_code=0, stdout='upstream\n') return command.CommandResult(return_code=0, stdout='upstream\n')
elif config == 'branch.%s.merge' % TEST_BRANCH: elif config == 'branch.%s.merge' % self._test_branch:
return command.CommandResult(return_code=0, return command.CommandResult(return_code=0,
stdout='refs/heads/master\n') stdout='refs/heads/master\n')
@ -505,3 +507,10 @@ class TestFunctional(unittest.TestCase):
self.assertEqual(self._builder.count, self._total_builds) self.assertEqual(self._builder.count, self._total_builds)
self.assertEqual(self._builder.fail, 0) self.assertEqual(self._builder.fail, 0)
self.assertEqual(self._make_calls, 3) self.assertEqual(self._make_calls, 3)
def testBranchWithSlash(self):
"""Test building a branch with a '/' in the name"""
self._test_branch = '/__dev/__testbranch'
self._RunControl('-b', self._test_branch, clean_dir=False)
self.assertEqual(self._builder.count, self._total_builds)
self.assertEqual(self._builder.fail, 0)