summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-19 00:18:35 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:24:53 +0000
commit0612ca4d0f67770391c8c66ee067ddb6a8759a61 (patch)
tree86829457b1b54d28a4d8b1ee48366990e61d7fa5 /meta
parentc1492c4e4f9d8c22c2f4cc2bf07d888e4efcbeb9 (diff)
downloadpoky-0612ca4d0f67770391c8c66ee067ddb6a8759a61.tar.gz
oe-selftest: devtool: fix test_devtool_add_library if python was built first
If Python is in the sysroot then this test can fail due to some brokenness in libftdi's CMakeLists.txt file for its python bindings. Just disable it in order to have the test work more reliably. (From OE-Core rev: 3e53e675bba75eb949be97a8d372e0134f6df935) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index f6471bdc48..43c7cdade1 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -208,15 +208,16 @@ class DevtoolTests(DevtoolBase):
208 # Fetch source 208 # Fetch source
209 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 209 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
210 self.track_for_cleanup(tempdir) 210 self.track_for_cleanup(tempdir)
211 url = 'http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.1.tar.bz2' 211 version = '1.1'
212 url = 'https://www.intra2net.com/en/developer/libftdi/download/libftdi1-%s.tar.bz2' % version
212 result = runCmd('wget %s' % url, cwd=tempdir) 213 result = runCmd('wget %s' % url, cwd=tempdir)
213 result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir) 214 result = runCmd('tar xfv libftdi1-%s.tar.bz2' % version, cwd=tempdir)
214 srcdir = os.path.join(tempdir, 'libftdi1-1.1') 215 srcdir = os.path.join(tempdir, 'libftdi1-%s' % version)
215 self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory') 216 self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory')
216 # Test devtool add (and use -V so we test that too) 217 # Test devtool add (and use -V so we test that too)
217 self.track_for_cleanup(self.workspacedir) 218 self.track_for_cleanup(self.workspacedir)
218 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') 219 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
219 result = runCmd('devtool add libftdi %s -V 1.1' % srcdir) 220 result = runCmd('devtool add libftdi %s -V %s' % (srcdir, version))
220 self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') 221 self.assertTrue(os.path.exists(os.path.join(self.workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created')
221 # Test devtool status 222 # Test devtool status
222 result = runCmd('devtool status') 223 result = runCmd('devtool status')
@@ -224,6 +225,9 @@ class DevtoolTests(DevtoolBase):
224 self.assertIn(srcdir, result.output) 225 self.assertIn(srcdir, result.output)
225 # Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then) 226 # Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then)
226 bitbake('libftdi -c cleansstate') 227 bitbake('libftdi -c cleansstate')
228 # libftdi's python/CMakeLists.txt is a bit broken, so let's just disable it
229 recipefile = '%s/recipes/libftdi/libftdi_%s.bb' % (self.workspacedir, version)
230 result = runCmd('recipetool setvar %s EXTRA_OECMAKE -- "-DPYTHON_BINDINGS=OFF"' % recipefile)
227 # Test devtool build 231 # Test devtool build
228 result = runCmd('devtool build libftdi') 232 result = runCmd('devtool build libftdi')
229 staging_libdir = get_bb_var('STAGING_LIBDIR', 'libftdi') 233 staging_libdir = get_bb_var('STAGING_LIBDIR', 'libftdi')