mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-12-21 01:12:11 +01:00
patman: Add a fourth series for testing
Create one more series to use for testing. This one has four separate patches. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
1be26d78cf
commit
dd16f0e262
@ -100,10 +100,11 @@ class TestCommon:
|
|||||||
def make_git_tree(self):
|
def make_git_tree(self):
|
||||||
"""Make a simple git tree suitable for testing
|
"""Make a simple git tree suitable for testing
|
||||||
|
|
||||||
It has three branches:
|
It has four branches:
|
||||||
'base' has two commits: PCI, main
|
'base' has two commits: PCI, main
|
||||||
'first' has base as upstream and two more commits: I2C, SPI
|
'first' has base as upstream and two more commits: I2C, SPI
|
||||||
'second' has base as upstream and three more: video, serial, bootm
|
'second' has base as upstream and three more: video, serial, bootm
|
||||||
|
'third4' has second as upstream and four more: usb, main, test, lib
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
pygit2.Repository: repository
|
pygit2.Repository: repository
|
||||||
@ -203,6 +204,29 @@ command to make the code as
|
|||||||
complicated as possible''')
|
complicated as possible''')
|
||||||
second_target = repo.revparse_single('HEAD')
|
second_target = repo.revparse_single('HEAD')
|
||||||
|
|
||||||
|
self.make_commit_with_file('usb: Try out the new DMA feature', '''
|
||||||
|
This is just a fix that
|
||||||
|
ensures that DMA is enabled
|
||||||
|
''', 'usb-uclass.c', '''Here is the USB
|
||||||
|
implementation and as you can see it
|
||||||
|
it very nice''')
|
||||||
|
self.make_commit_with_file('main: Change to the main program', '''
|
||||||
|
Here we adjust the main
|
||||||
|
program just a little bit
|
||||||
|
''', 'main.c', '''This is the text of the main program''')
|
||||||
|
self.make_commit_with_file('test: Check that everything works', '''
|
||||||
|
This checks that all the
|
||||||
|
various things we've been
|
||||||
|
adding actually work.
|
||||||
|
''', 'test.c', '''Here is the test code and it seems OK''')
|
||||||
|
self.make_commit_with_file('lib: Sort out the extra library', '''
|
||||||
|
The extra library is currently
|
||||||
|
broken. Fix it so that we can
|
||||||
|
use it in various place.
|
||||||
|
''', 'lib.c', '''Some library code is here
|
||||||
|
and a little more''')
|
||||||
|
third_target = repo.revparse_single('HEAD')
|
||||||
|
|
||||||
repo.branches.local.create('first', first_target)
|
repo.branches.local.create('first', first_target)
|
||||||
repo.config.set_multivar('branch.first.remote', '', '.')
|
repo.config.set_multivar('branch.first.remote', '', '.')
|
||||||
repo.config.set_multivar('branch.first.merge', '', 'refs/heads/base')
|
repo.config.set_multivar('branch.first.merge', '', 'refs/heads/base')
|
||||||
@ -213,6 +237,11 @@ complicated as possible''')
|
|||||||
|
|
||||||
repo.branches.local.create('base', base_target)
|
repo.branches.local.create('base', base_target)
|
||||||
|
|
||||||
|
repo.branches.local.create('third4', third_target)
|
||||||
|
repo.config.set_multivar('branch.third4.remote', '', '.')
|
||||||
|
repo.config.set_multivar('branch.third4.merge', '',
|
||||||
|
'refs/heads/second')
|
||||||
|
|
||||||
target = repo.lookup_reference('refs/heads/first')
|
target = repo.lookup_reference('refs/heads/first')
|
||||||
repo.checkout(target, strategy=pygit2.GIT_CHECKOUT_FORCE)
|
repo.checkout(target, strategy=pygit2.GIT_CHECKOUT_FORCE)
|
||||||
target = repo.revparse_single('HEAD')
|
target = repo.revparse_single('HEAD')
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user