Skip to contentSkip to conversation

oe-selftest: devtool: switch away from mkelfimage

PATCH New Paul Eggleton 1 participant 2 messages Dec 12, 2017

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover oe-selftest: devtool: switch away from mkelfimage

Fix oe-selftest for Saul's impending removal of mkelfimage.

The following changes since commit a24c10b7bdab8aa960fdd3a58d2009f24344e579:

populate_sdk_ext: Use prebuilt uninative tarball (2017-12-11 21:46:33 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/oe-selftest-mkelfimage
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/oe-selftest-mkelfimage

Paul Eggleton (1):
oe-selftest: devtool: switch away from mkelfimage

 meta/lib/oeqa/selftest/cases/devtool.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.9.5
author
#1 lore raw

PATCH 1/1 oe-selftest: devtool: switch away from mkelfimage

mkelfimage is about to be removed, so test_devtool_modify_git needs to use a different recipe. psplash is a reasonable choice given it uses a git repository (and probably will forever), and doesn't have too many dependencies, so change the test to use that recipe instead.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/lib/oeqa/selftest/cases/devtool.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/lib/oeqa/selftest/cases/devtool.py +3 -3
index 8a1e685..6989de9 100644
@@ -611,7 +611,7 @@ class DevtoolTests(DevtoolBase):
     @OETestID(1165)
     def test_devtool_modify_git(self):
         # Check preconditions
-        testrecipe = 'mkelfimage'
+        testrecipe = 'psplash'
         src_uri = get_bb_var('SRC_URI', testrecipe)
         self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
         # Clean up anything in the workdir/sysroot/sstate cache

@@ -623,9 +623,9 @@ class DevtoolTests(DevtoolBase):
         self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
         self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe)
         result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir))
-        self.assertExists(os.path.join(tempdir, 'Makefile'), 'Extracted source could not be found')
+        self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found')
         self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created. devtool output: %s' % result.output)
-        matches = glob.glob(os.path.join(self.workspacedir, 'appends', 'mkelfimage_*.bbappend'))
+        matches = glob.glob(os.path.join(self.workspacedir, 'appends', 'psplash_*.bbappend'))
         self.assertTrue(matches, 'bbappend not created')
         # Test devtool status
         result = runCmd('devtool status')
Signature · 1 line
2.9.5