summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-02-06 14:35:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-07 14:50:10 +0000
commita624cf7f95c8cf4ff764cc997fd1db4601b97dcc (patch)
tree975e63962247e423adea48b89cac306655bd01d9 /meta
parentc0f56dbaf3c4fe6b9ba8fbdbe886dc2e8f11726b (diff)
downloadpoky-a624cf7f95c8cf4ff764cc997fd1db4601b97dcc.tar.gz
oeqa/selftest/pkgdata: use m4 instead of bash
The pkgdata test broke due to oe-core cf0fd8b which added alternatives support to bash, so the binary is now /bin/bash.bash. Instead of fixing the test case for this new name, use the m4 recipe instead as it has less build dependencies. (From OE-Core rev: 68da6c98841f4450736ae170e443aa744c8b77eb) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/pkgdata.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/meta/lib/oeqa/selftest/pkgdata.py
index adfe346879..3512ce3531 100644
--- a/meta/lib/oeqa/selftest/pkgdata.py
+++ b/meta/lib/oeqa/selftest/pkgdata.py
@@ -16,7 +16,7 @@ class OePkgdataUtilTests(oeSelfTest):
16 # Ensure we have the right data in pkgdata 16 # Ensure we have the right data in pkgdata
17 logger = logging.getLogger("selftest") 17 logger = logging.getLogger("selftest")
18 logger.info('Running bitbake to generate pkgdata') 18 logger.info('Running bitbake to generate pkgdata')
19 bitbake('glibc busybox zlib bash') 19 bitbake('glibc busybox zlib m4')
20 20
21 @testcase(1203) 21 @testcase(1203)
22 def test_lookup_pkg(self): 22 def test_lookup_pkg(self):
@@ -43,7 +43,7 @@ class OePkgdataUtilTests(oeSelfTest):
43 self.assertEqual(result.output, 'zlib') 43 self.assertEqual(result.output, 'zlib')
44 result = runCmd('oe-pkgdata-util read-value PKG libz1') 44 result = runCmd('oe-pkgdata-util read-value PKG libz1')
45 self.assertEqual(result.output, 'libz1') 45 self.assertEqual(result.output, 'libz1')
46 result = runCmd('oe-pkgdata-util read-value PKGSIZE bash') 46 result = runCmd('oe-pkgdata-util read-value PKGSIZE m4')
47 pkgsize = int(result.output.strip()) 47 pkgsize = int(result.output.strip())
48 self.assertGreater(pkgsize, 1, "Size should be greater than 1. %s" % result.output) 48 self.assertGreater(pkgsize, 1, "Size should be greater than 1. %s" % result.output)
49 49
@@ -51,8 +51,8 @@ class OePkgdataUtilTests(oeSelfTest):
51 def test_find_path(self): 51 def test_find_path(self):
52 result = runCmd('oe-pkgdata-util find-path /lib/libc.so.6') 52 result = runCmd('oe-pkgdata-util find-path /lib/libc.so.6')
53 self.assertEqual(result.output, 'glibc: /lib/libc.so.6') 53 self.assertEqual(result.output, 'glibc: /lib/libc.so.6')
54 result = runCmd('oe-pkgdata-util find-path /bin/bash') 54 result = runCmd('oe-pkgdata-util find-path /usr/bin/m4')
55 self.assertEqual(result.output, 'bash: /bin/bash') 55 self.assertEqual(result.output, 'm4: /usr/bin/m4')
56 result = runCmd('oe-pkgdata-util find-path /not/exist', ignore_status=True) 56 result = runCmd('oe-pkgdata-util find-path /not/exist', ignore_status=True)
57 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) 57 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
58 self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /not/exist') 58 self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /not/exist')