aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Gamblin <trevor.gamblin@windriver.com>2020-11-23 16:26:21 -0500
committerKhem Raj <raj.khem@gmail.com>2020-11-23 22:51:38 -0800
commitffafb00e45ad693da27662f13976f6a8247820c6 (patch)
tree0448482e784e925f513d215febad69610bc84c5b
parentd9d871386087cdad9fd2197976bb00f21b1df081 (diff)
downloadmeta-openembedded-contrib-ffafb00e45ad693da27662f13976f6a8247820c6.tar.gz
meta-openembedded-contrib-ffafb00e45ad693da27662f13976f6a8247820c6.tar.bz2
meta-openembedded-contrib-ffafb00e45ad693da27662f13976f6a8247820c6.zip
python3-jinja2: Fix ptest RDEPENDS and file installation
jinja2's ptest is failing when running meta-python-ptest-image. This is happening for two reasons: 1) python3-jinja2 is in oe-core, but the ptests are disabled. 2) python3-toml is required for the ptest; Because of #1, do_install_ptest doesn't actually run and so no tests are installed for ptest-runner to use. This patch adds do_install_ptest to the bbappend file for jinja2, and also adds python3-toml to the ptest RDEPENDS so that it will install the tests and run correctly. Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend b/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
index 91814e6cde..9fe358427a 100644
--- a/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
+++ b/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
@@ -1,2 +1,13 @@
# Main recipe was moved to oe-core, but with ptest disabled
inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/tests
+ cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS_${PN}-ptest += " \
+ ${PYTHON_PN}-pytest \
+ ${PYTHON_PN}-toml \
+ ${PYTHON_PN}-unixadmin \
+"