diff options
author | Ross Burton <ross.burton@intel.com> | 2016-06-15 12:01:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-23 14:26:14 +0100 |
commit | 675843d540f30058269789b2c6808a206ab04a04 (patch) | |
tree | 85383a91e26ddebb9dc3bcd8b4c63d47dc3bf5c5 /meta/lib/oeqa/runtime/smart.py | |
parent | c65cf8ede2116ef1fa3ddeb617e7c39caacff941 (diff) | |
download | poky-675843d540f30058269789b2c6808a206ab04a04.tar.gz |
oeqa: fix hasPackage, add hasPackageMatch
hasPackage() was looking for the string provided as an RE substring in the
manifest, which resulted in a large number of false positives (i.e. libgtkfoo
would match "gtk+").
Rewrite the manifest loader to parse the files into a proper data structure,
change hasPackage to do full string matches, and add hasPackageMatch which does
RE substring matches.
(From OE-Core rev: b9409863af71899e02275439949e3f4cdfaf2d0f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime/smart.py')
-rw-r--r-- | meta/lib/oeqa/runtime/smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py index 126d614638..c7a5753991 100644 --- a/meta/lib/oeqa/runtime/smart.py +++ b/meta/lib/oeqa/runtime/smart.py | |||
@@ -7,7 +7,7 @@ from oeqa.utils.httpserver import HTTPService | |||
7 | def setUpModule(): | 7 | def setUpModule(): |
8 | if not oeRuntimeTest.hasFeature("package-management"): | 8 | if not oeRuntimeTest.hasFeature("package-management"): |
9 | skipModule("Image doesn't have package management feature") | 9 | skipModule("Image doesn't have package management feature") |
10 | if not oeRuntimeTest.hasPackage("smart"): | 10 | if not oeRuntimeTest.hasPackage("smartpm"): |
11 | skipModule("Image doesn't have smart installed") | 11 | skipModule("Image doesn't have smart installed") |
12 | if "package_rpm" != oeRuntimeTest.tc.d.getVar("PACKAGE_CLASSES", True).split()[0]: | 12 | if "package_rpm" != oeRuntimeTest.tc.d.getVar("PACKAGE_CLASSES", True).split()[0]: |
13 | skipModule("Rpm is not the primary package manager") | 13 | skipModule("Rpm is not the primary package manager") |