oe-selftest: devtool: test that updating a file with subdir= works
If you have a file:// entry in SRC_URI with a subdir= parameter that makes it extract into the source tree, then when you update that file in oe-local-files and run devtool update-recipe then you want the original file to be updated. This was made to work by OE-Core commit 9069fef5dad5a873c8a8f720f7bcbc7625556309 together with 31f1bbad248c36a8c86dde4ff57ce42efc664082, however until now there was no oe-selftest test to verify it. Note that in order to succeed this test also requires the fix "lib/oe/recipeutils: ignore archives by default in get_recipe_local_files()" since the test recipe uses a local tarball. (From OE-Core rev: 936eba3e1059d1dcd5e58c1ce76870fff7b11b3c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e3193b76e0
commit
39fba4d70f
|
@ -0,0 +1,7 @@
|
|||
LICENSE = "CLOSED"
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
SRC_URI = "file://devtool-test-subdir.tar.gz \
|
||||
file://testfile;subdir=${BPN}"
|
||||
|
||||
S = "${WORKDIR}/${BPN}"
|
Binary file not shown.
|
@ -0,0 +1 @@
|
|||
Modified version
|
|
@ -972,6 +972,31 @@ class DevtoolTests(DevtoolBase):
|
|||
if 'gzip compressed data' not in result.output:
|
||||
self.fail('New patch file is not gzipped - file reports:\n%s' % result.output)
|
||||
|
||||
def test_devtool_update_recipe_local_files_subdir(self):
|
||||
# Try devtool extract on a recipe that has a file with subdir= set in
|
||||
# SRC_URI such that it overwrites a file that was in an archive that
|
||||
# was also in SRC_URI
|
||||
# First, modify the recipe
|
||||
testrecipe = 'devtool-test-subdir'
|
||||
recipefile = get_bb_var('FILE', testrecipe)
|
||||
src_uri = get_bb_var('SRC_URI', testrecipe)
|
||||
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
|
||||
self.track_for_cleanup(tempdir)
|
||||
self.track_for_cleanup(self.workspacedir)
|
||||
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
|
||||
# (don't bother with cleaning the recipe on teardown, we won't be building it)
|
||||
result = runCmd('devtool modify %s' % testrecipe)
|
||||
testfile = os.path.join(self.workspacedir, 'sources', testrecipe, 'testfile')
|
||||
self.assertTrue(os.path.exists(testfile), 'Extracted source could not be found')
|
||||
with open(testfile, 'r') as f:
|
||||
contents = f.read().rstrip()
|
||||
self.assertEqual(contents, 'Modified version', 'File has apparently not been overwritten as it should have been')
|
||||
# Test devtool update-recipe without modifying any files
|
||||
self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)))
|
||||
result = runCmd('devtool update-recipe %s' % testrecipe)
|
||||
expected_status = []
|
||||
self._check_repo_status(os.path.dirname(recipefile), expected_status)
|
||||
|
||||
@testcase(1163)
|
||||
def test_devtool_extract(self):
|
||||
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
|
||||
|
|
Loading…
Reference in New Issue