diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-04-27 10:53:18 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:14 +0100 |
| commit | d1b6e1dfdbd0f77bc21863471db39816cfc3c3be (patch) | |
| tree | 38fa54cf9101b7793963c1d31ac1eafa3702f801 /meta/lib | |
| parent | 2bc3328b8b2a718221d2c206cc6f4d8cbc09e9c8 (diff) | |
| download | ast2050-yocto-poky-d1b6e1dfdbd0f77bc21863471db39816cfc3c3be.zip ast2050-yocto-poky-d1b6e1dfdbd0f77bc21863471db39816cfc3c3be.tar.gz | |
devtool: add: use correct bbappend file name with -V option
We weren't adding the version into the bbappend file name when -V was
specified which meant that building or resetting failed.
Also adjust one of the tests so that we're testing devtool add both with
and without this option.
Fixes [YOCTO #7647].
(From OE-Core master rev: bdbeff0cd342e31053d7203d78fc5dda611052b1)
(From OE-Core rev: 0b9e8817fc8ba375a1045a66d04b3fd2b498427b)
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/devtool.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index dc1cf21..c198837 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -150,10 +150,10 @@ class DevtoolTests(oeSelfTest): result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir) srcdir = os.path.join(tempdir, 'libftdi1-1.1') self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory') - # Test devtool add + # Test devtool add (and use -V so we test that too) self.track_for_cleanup(workspacedir) self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - result = runCmd('devtool add libftdi %s' % srcdir) + result = runCmd('devtool add libftdi %s -V 1.1' % srcdir) self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') # Test devtool status result = runCmd('devtool status') |
