summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-12-12 15:26:19 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:37 +0000
commita77b6ee767ced8d181e95c3662fa9584bf1bacba (patch)
treee7531b4bda07a77657879627263ff97a92472eff
parent5623065801b977aa6e27f2d75f3a471224731d64 (diff)
downloadpoky-a77b6ee767ced8d181e95c3662fa9584bf1bacba.tar.gz
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. (From OE-Core rev: daf583efc87faa058684dfe34df596d088caa8ef) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 8a1e6858d3..6989de939e 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -611,7 +611,7 @@ class DevtoolTests(DevtoolBase):
611 @OETestID(1165) 611 @OETestID(1165)
612 def test_devtool_modify_git(self): 612 def test_devtool_modify_git(self):
613 # Check preconditions 613 # Check preconditions
614 testrecipe = 'mkelfimage' 614 testrecipe = 'psplash'
615 src_uri = get_bb_var('SRC_URI', testrecipe) 615 src_uri = get_bb_var('SRC_URI', testrecipe)
616 self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe) 616 self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
617 # Clean up anything in the workdir/sysroot/sstate cache 617 # Clean up anything in the workdir/sysroot/sstate cache
@@ -623,9 +623,9 @@ class DevtoolTests(DevtoolBase):
623 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') 623 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
624 self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe) 624 self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe)
625 result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) 625 result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir))
626 self.assertExists(os.path.join(tempdir, 'Makefile'), 'Extracted source could not be found') 626 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found')
627 self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created. devtool output: %s' % result.output) 627 self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created. devtool output: %s' % result.output)
628 matches = glob.glob(os.path.join(self.workspacedir, 'appends', 'mkelfimage_*.bbappend')) 628 matches = glob.glob(os.path.join(self.workspacedir, 'appends', 'psplash_*.bbappend'))
629 self.assertTrue(matches, 'bbappend not created') 629 self.assertTrue(matches, 'bbappend not created')
630 # Test devtool status 630 # Test devtool status
631 result = runCmd('devtool status') 631 result = runCmd('devtool status')