mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
classes/ptest-python-pytest: simplify python ptest file overriding
The complexity of overriding files from the bbclass made the behavior at times hard to follow and predict. This change replaces the default file with a heredoc equivalent that creates a default file if the user does not provide their own version of run-ptest in the SRC_URI. (From OE-Core rev: be3db5f4f1b857b93d08211019d9ff796ec389b6) Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e634211f20
commit
30af2f18b9
@@ -6,19 +6,25 @@
|
||||
|
||||
inherit ptest
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${COREBASE}/meta/files:"
|
||||
|
||||
SRC_URI:append = "\
|
||||
file://ptest-python-pytest/run-ptest \
|
||||
"
|
||||
|
||||
# Overridable configuration for the directory within the source tree
|
||||
# containing the pytest files
|
||||
PTEST_PYTEST_DIR ?= "tests"
|
||||
|
||||
do_install_ptest() {
|
||||
if [ ! -f ${D}${PTEST_PATH}/run-ptest ]; then
|
||||
install -m 0755 ${UNPACKDIR}/ptest-python-pytest/run-ptest ${D}${PTEST_PATH}
|
||||
# Check if the recipe provides its own version of run-ptest
|
||||
# If nothing exists in the SRC_URI, dynamically create a
|
||||
# run-test script of "last resort" that has the default
|
||||
# pytest behavior.
|
||||
#
|
||||
# Users can override this behavior by simply including a
|
||||
# custom script (run-ptest) in the source file list
|
||||
if [ ! -f "${UNPACKDIR}/run-ptest" ]; then
|
||||
cat > ${D}${PTEST_PATH}/run-ptest << EOF
|
||||
#!/bin/sh
|
||||
pytest --automake
|
||||
EOF
|
||||
# Ensure the newly created script has the execute bit set
|
||||
chmod 755 ${D}${PTEST_PATH}/run-ptest
|
||||
fi
|
||||
if [ -d "${S}/${PTEST_PYTEST_DIR}" ]; then
|
||||
install -d ${D}${PTEST_PATH}/${PTEST_PYTEST_DIR}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
pytest --automake
|
||||
Reference in New Issue
Block a user