mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

ostree: Drop tests for soup/xattr with ptest

Browse Source 
When ptest is enabled, both soup (for trivial-httpd) and xattr must be
enabled for all tests to pass. Rather than forcing everyone to enable
these, just document this and remove the tests since a subset of the
tests are still useful.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alex Kiernan
2019-12-02 19:33:40 +00:00
committed by Khem Raj
parent f6df0263f7
commit a977b60045
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+2 -4
View File
@@ -42,6 +42,8 @@ inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig ptest-
# Package configuration - match ostree defaults, but without rofiles-fuse # Package configuration - match ostree defaults, but without rofiles-fuse
# otherwise we introduce a dependendency on meta-filesystems # otherwise we introduce a dependendency on meta-filesystems
#
# If running with ptest, both soup (for trivial-httpd) and xattr are required
PACKAGECONFIG ??= " \ PACKAGECONFIG ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
@@ -185,8 +187,4 @@ python __anonymous() {
if bb.utils.contains('PTEST_ENABLED', '1', 'True', '', d): if bb.utils.contains('PTEST_ENABLED', '1', 'True', '', d):
if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', '', d): if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', '', d):
raise bb.parse.SkipRecipe('ptest requires meta-python to be present.') raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d):
raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.')
elif not oe.utils.any_distro_features(d, "xattr"):
raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.')
} }