[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4551/8267] oeqa/selftest/pkgdata: use m4 instead of bash
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 4551/8267] oeqa/selftest/pkgdata: use m4 instead of bash
- Date: Sun, 17 Dec 2017 02:11:44 +0000 (UTC)
commit a624cf7f95c8cf4ff764cc997fd1db4601b97dcc
Author: Ross Burton <ross burton intel com>
Date: Mon Feb 6 14:35:30 2017 +0000
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>
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 adfe346..3512ce3 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')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]