diff options
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 5c4694b1fd..f0ffd255ff 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -304,7 +304,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" -RDEPENDS_${PN}-ptest = "bash grep coreutils" +RDEPENDS_${PN}-ptest = "bash grep coreutils which util-linux-blkid util-linux-fsck btrfs-tools" do_compile_ptest() { oe_runmake buildtest-TESTS @@ -312,23 +312,30 @@ do_compile_ptest() { do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/tests/ts - find . -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; - cp ${S}/tests/functions.sh ${D}${PTEST_PATH}/tests/ - cp ${S}/tests/commands.sh ${D}${PTEST_PATH}/tests/ - cp ${S}/tests/run.sh ${D}${PTEST_PATH}/tests/ - cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected + find . -name 'test*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; + find ./.libs -name 'sample*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; + find ./.libs -name 'test*' -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \; - list="bitops build-sys cal col colrm column dmesg fsck hexdump hwclock ipcs isosize login look md5 misc more namei paths schedutils script swapon" - # The following tests are not installed yet: - # blkid scsi_debug module dependent - # cramfs gcc dependent - # eject gcc dependent - # fdisk scsi_debug module and gcc dependent - # lscpu gcc dependant - # libmount uuidgen dependent - # mount gcc dependant - # partx blkid dependant - for d in $list; do - cp -pR ${S}/tests/ts/$d ${D}${PTEST_PATH}/tests/ts/ - done + cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ + cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected + cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ + cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} + + # The original paths of executables to be tested point to a local folder containing + # the executables. We want to test the installed executables, not the local copies. + # So strip the paths, the executables will be located via "which" + sed -i \ + -e '/^TS_CMD/ s|$top_builddir/||g' \ + -e '/^TS_HELPER/ s|$top_builddir|${PTEST_PATH}|g' \ + ${D}${PTEST_PATH}/tests/commands.sh + + # Change 'if [ ! -x "$1" ]' to 'if [ ! -x "`which $1 2>/dev/null`"]' + sed -i -e \ + '/^\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 + sed -i -e \ + '/^TS_CMD_KILL/ s|kill|/bin/kill|g' \ + ${D}${PTEST_PATH}/tests/commands.sh } |