summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-27 10:53:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 15:05:52 +0100
commite8db1ccef362e11a0736b3e1b89555dcf2a7dfa1 (patch)
treeffcb1eebb59e186f39cfc748d8111f42810564c9 /meta/lib
parentf1f9fab266503eb81aa624b98b8577e5fe3ad5b6 (diff)
downloadpoky-e8db1ccef362e11a0736b3e1b89555dcf2a7dfa1.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 rev: bdbeff0cd342e31053d7203d78fc5dda611052b1) 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.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 1a5eecd84c..68818359bc 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -150,10 +150,10 @@ class DevtoolTests(oeSelfTest):
150 result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir) 150 result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir)
151 srcdir = os.path.join(tempdir, 'libftdi1-1.1') 151 srcdir = os.path.join(tempdir, 'libftdi1-1.1')
152 self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory') 152 self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory')
153 # Test devtool add 153 # Test devtool add (and use -V so we test that too)
154 self.track_for_cleanup(workspacedir) 154 self.track_for_cleanup(workspacedir)
155 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') 155 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
156 result = runCmd('devtool add libftdi %s' % srcdir) 156 result = runCmd('devtool add libftdi %s -V 1.1' % srcdir)
157 self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') 157 self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created')
158 # Test devtool status 158 # Test devtool status
159 result = runCmd('devtool status') 159 result = runCmd('devtool status')