mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/selftest/devtool: add test for git submodules

Browse Source 
Add a test for gitsm recipes.
This tests that we can do changes on submodules, commit them and
properly extract the patches

(From OE-Core rev: 2fb69161fe9d25691b75a043ec5566ffe4a25b37)

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Julien Stephan
2023-11-22 12:08:17 +01:00
committed by Richard Purdie
parent 89f1662484
commit 49f549a142
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
meta/lib/oeqa/selftest/cases/devtool.py
View File

@@ -1598,6 +1598,53 @@ class DevtoolUpdateTests(DevtoolBase):
# Try building
bitbake('%s -c patch' % testrecipe)
def test_devtool_git_submodules(self):
# This tests if we can add a patch in a git submodule and extract it properly using devtool finish
# Check preconditions
self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
self.track_for_cleanup(self.workspacedir)
recipe = 'vulkan-samples'
src_uri = get_bb_var('SRC_URI', recipe)
self.assertIn('gitsm://', src_uri, 'This test expects the %s recipe to be a git recipe with submodules' % recipe)
oldrecipefile = get_bb_var('FILE', recipe)
recipedir = os.path.dirname(oldrecipefile)
result = runCmd('git status --porcelain .', cwd=recipedir)
if result.output.strip():
self.fail('Recipe directory for %s contains uncommitted changes' % recipe)
self.assertIn('/meta/', recipedir)
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
self.track_for_cleanup(tempdir)
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
result = runCmd('devtool modify %s %s' % (recipe, tempdir))
self.assertExists(os.path.join(tempdir, 'CMakeLists.txt'), 'Extracted source could not be found')
# Test devtool status
result = runCmd('devtool status')
self.assertIn(recipe, result.output)
self.assertIn(tempdir, result.output)
# Modify a source file in a submodule, (grab the first one)
result = runCmd('git submodule --quiet foreach \'echo $sm_path\'', cwd=tempdir)
submodule = result.output.splitlines()[0]
submodule_path = os.path.join(tempdir, submodule)
runCmd('echo "#This is a first comment" >> testfile', cwd=submodule_path)
result = runCmd('git status --porcelain . ', cwd=submodule_path)
self.assertIn("testfile", result.output)
runCmd('git add testfile; git commit -m "Adding a new file"', cwd=submodule_path)
# Try finish to the original layer
self.add_command_to_tearDown('rm -rf %s ; cd %s ; git checkout %s' % (recipedir, os.path.dirname(recipedir), recipedir))
runCmd('devtool finish -f %s meta' % recipe)
result = runCmd('devtool status')
self.assertNotIn(recipe, result.output, 'Recipe should have been reset by finish but wasn\'t')
self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after finish')
expected_status = [(' M', '.*/%s$' % os.path.basename(oldrecipefile)),
('??', '.*/.*-Adding-a-new-file.patch$')]
self._check_repo_status(recipedir, expected_status)
# Make sure the patch is added to the recipe with the correct "patchdir" option
result = runCmd('git diff .', cwd=recipedir)
addlines = [
'file://0001-Adding-a-new-file.patch;patchdir=%s \\\\' % submodule
]
self._check_diff(result.output, addlines, [])
class DevtoolExtractTests(DevtoolBase):