diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-02-06 14:35:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-07 14:48:56 +0000 |
| commit | 68da6c98841f4450736ae170e443aa744c8b77eb (patch) | |
| tree | ffc52faa4b929435a8c105f8eff1d08a463385da /meta/lib/oeqa/selftest | |
| parent | 38c9e4531bcac71b873dd3bc0b264954c9d90150 (diff) | |
| download | openembedded-core-68da6c98841f4450736ae170e443aa744c8b77eb.tar.gz openembedded-core-68da6c98841f4450736ae170e443aa744c8b77eb.tar.bz2 openembedded-core-68da6c98841f4450736ae170e443aa744c8b77eb.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib/oeqa/selftest')
| -rw-r--r-- | meta/lib/oeqa/selftest/pkgdata.py | 8 |
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): # Ensure we have the right data in pkgdata logger = logging.getLogger("selftest") logger.info('Running bitbake to generate pkgdata') - bitbake('glibc busybox zlib bash') + bitbake('glibc busybox zlib m4') @testcase(1203) def test_lookup_pkg(self): @@ -43,7 +43,7 @@ class OePkgdataUtilTests(oeSelfTest): self.assertEqual(result.output, 'zlib') result = runCmd('oe-pkgdata-util read-value PKG libz1') self.assertEqual(result.output, 'libz1') - result = runCmd('oe-pkgdata-util read-value PKGSIZE bash') + result = runCmd('oe-pkgdata-util read-value PKGSIZE m4') pkgsize = int(result.output.strip()) self.assertGreater(pkgsize, 1, "Size should be greater than 1. %s" % result.output) @@ -51,8 +51,8 @@ class OePkgdataUtilTests(oeSelfTest): def test_find_path(self): result = runCmd('oe-pkgdata-util find-path /lib/libc.so.6') self.assertEqual(result.output, 'glibc: /lib/libc.so.6') - result = runCmd('oe-pkgdata-util find-path /bin/bash') - self.assertEqual(result.output, 'bash: /bin/bash') + result = runCmd('oe-pkgdata-util find-path /usr/bin/m4') + self.assertEqual(result.output, 'm4: /usr/bin/m4') result = runCmd('oe-pkgdata-util find-path /not/exist', ignore_status=True) self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /not/exist') |