mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
util-linux: Use PTEST binary directory
Some binaries generated by util-linux will be replaced by core-utils in the final image by update-alternatives, so use a dedicated directory with symlinks to avoid using a binary generated by another package. This will solve the issue with the ptest runner timing out when running the kill ptests for util-linux. [YOCTO #13238] (From OE-Core rev: 1a8fd875f0b171e25a5ac8a32cc81ff3887935bd) Signed-off-by: Mariano Lopez <just.another.mariano@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6995ec65e8
commit
db9a0dd784
@@ -284,6 +284,7 @@ ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PTEST_BINDIR = "1"
|
||||
do_compile_ptest() {
|
||||
oe_runmake buildtest-TESTS
|
||||
}
|
||||
@@ -312,8 +313,8 @@ do_install_ptest() {
|
||||
'/^\tif[[:space:]]\[[[:space:]]![[:space:]]-x[[:space:]]"$1"/s|$1|`which $1 2>/dev/null`|g' \
|
||||
${D}${PTEST_PATH}/tests/functions.sh
|
||||
|
||||
# "kill -L" behaves differently than "/bin/kill -L" so we need an additional fix
|
||||
# Running "kill" without the the complete path would use the shell's built-in kill
|
||||
sed -i -e \
|
||||
'/^TS_CMD_KILL/ s|kill|/bin/kill|g' \
|
||||
'/^TS_CMD_KILL/ s|kill|${PTEST_PATH}/bin/kill|g' \
|
||||
${D}${PTEST_PATH}/tests/commands.sh
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user