diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-08-31 11:54:10 +1200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-31 23:25:33 +0100 |
| commit | 355d8f42679e37610c2947dece597ed7db774bee (patch) | |
| tree | 5796bca83d25b456c66001d090240a8fb523438f /meta/lib | |
| parent | d5191840212adbf480961ba6fc68e1ab17e5a77a (diff) | |
| download | openembedded-core-contrib-355d8f42679e37610c2947dece597ed7db774bee.tar.gz | |
oe-selftest: devtool: test find-recipe and edit-recipe
We weren't testing the devtool find-recipe and edit-recipe subcommands,
with the result that when they regressed recently we didn't notice. Add
some code into the test_devtool_add to test this (since we need a
recipe in the workspace, and adding a new test with all that preamble
would seem a bit excessive for these simple checks). Also take the
opportunity to refactor the test a little bit so that the recipe name
and version are variables rather than hardcoding them everywhere.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 88d69724f9..c17131a56d 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -194,26 +194,35 @@ class DevtoolTests(DevtoolBase): # Fetch source tempdir = tempfile.mkdtemp(prefix='devtoolqa') self.track_for_cleanup(tempdir) + pn = 'pv' + pv = '1.5.3' url = 'http://www.ivarch.com/programs/sources/pv-1.5.3.tar.bz2' result = runCmd('wget %s' % url, cwd=tempdir) - result = runCmd('tar xfv pv-1.5.3.tar.bz2', cwd=tempdir) - srcdir = os.path.join(tempdir, 'pv-1.5.3') + result = runCmd('tar xfv %s' % os.path.basename(url), cwd=tempdir) + srcdir = os.path.join(tempdir, '%s-%s' % (pn, pv)) self.assertTrue(os.path.isfile(os.path.join(srcdir, 'configure')), 'Unable to find configure script in source directory') # Test devtool add self.track_for_cleanup(self.workspacedir) - self.add_command_to_tearDown('bitbake -c cleansstate pv') + self.add_command_to_tearDown('bitbake -c cleansstate %s' % pn) self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - result = runCmd('devtool add pv %s' % srcdir) + result = runCmd('devtool add %s %s' % (pn, srcdir)) self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') # Test devtool status result = runCmd('devtool status') - self.assertIn('pv', result.output) + recipepath = '%s/recipes/%s/%s_%s.bb' % (self.workspacedir, pn, pn, pv) + self.assertIn(recipepath, result.output) self.assertIn(srcdir, result.output) + # Test devtool find-recipe + result = runCmd('devtool -q find-recipe %s' % pn) + self.assertEqual(recipepath, result.output.strip()) + # Test devtool edit-recipe + result = runCmd('EDITOR="echo 123" devtool -q edit-recipe %s' % pn) + self.assertEqual('123 %s' % recipepath, result.output.strip()) # Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then) - bitbake('pv -c cleansstate') + bitbake('%s -c cleansstate' % pn) # Test devtool build - result = runCmd('devtool build pv') - bb_vars = get_bb_vars(['D', 'bindir'], 'pv') + result = runCmd('devtool build %s' % pn) + bb_vars = get_bb_vars(['D', 'bindir'], pn) installdir = bb_vars['D'] self.assertTrue(installdir, 'Could not query installdir variable') bindir = bb_vars['bindir'] |