From bdbeff0cd342e31053d7203d78fc5dda611052b1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 27 Apr 2015 10:53:18 +0100 Subject: 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]. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/devtool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/lib') 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): 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') -- cgit v1.2.3