From: Oleh Matiusha Date: Wed, 8 Sep 2021 17:17:54 +0000 (+0300) Subject: findutils: add ptest X-Git-Tag: uninative-3.5~1343 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=da489ef6e36711cb40d26f64f292fb92a0073f4a;p=openembedded-core.git findutils: add ptest Placed it in PTESTS_SLOW since it takes 36s to execute this ptest on qemu. Signed-off-by: Oleh Matiusha Signed-off-by: Alexandre Belloni --- diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 3709998f29..2e324f8da4 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -72,6 +72,7 @@ PTESTS_SLOW = "\ coreutils-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ + findutils-ptest \ glib-2.0-ptest \ gstreamer1.0-ptest \ libevent-ptest \ diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index ea8a1b7afe..ddcc05750b 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -6,9 +6,11 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/" BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" SECTION = "console/utils" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ + file://run-ptest \ + " -inherit autotools gettext texinfo update-alternatives +inherit autotools gettext texinfo update-alternatives ptest ALTERNATIVE:${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest new file mode 100644 index 0000000000..ec71583c51 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/run-ptest @@ -0,0 +1,57 @@ +#!/bin/bash + +# create temporary symlink to workaround missing oldfind +ln -s /usr/bin/find /tmp/oldfind +# make oldfind visible +export PATH="/tmp:${PATH}" + +export built_programs="find xargs locate updatedb" + +# this gets substituted by sed during build +export VERSION="__run_ptest_version__" + +# define missing functions for tests/init.sh +fu_path_prepend_ () { + path_prepend_ $@ +} + +print_ver_ () { + : +} + +skip_if_root_ () { + [ $(id -u) = 0 ] && exit 77; +} + +require_root_ () { + [ $(id -u) = 0 ] || exit 77; +} + +expensive_ () { + : +} + +export -f fu_path_prepend_ +export -f print_ver_ +export -f skip_if_root_ +export -f require_root_ +export -f expensive_ + + +for f in tests/*/*.sh; do + bash $f ; + case $? in + 0 ) + echo -n "PASS";; + 77 ) + echo -n "SKIP";; + * ) + echo -n "FAIL";; + esac + echo ": $f" +done + +#remove symlink +rm -f /tmp/oldfind + +echo diff --git a/meta/recipes-extended/findutils/findutils_4.8.0.bb b/meta/recipes-extended/findutils/findutils_4.8.0.bb index d8ccf4b8e1..b0e56da159 100644 --- a/meta/recipes-extended/findutils/findutils_4.8.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.8.0.bb @@ -13,3 +13,14 @@ PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" + +RDEPENDS:${PN}-ptest += "bash sed grep" + +do_install_ptest:class-target() { + mkdir -p ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ + + # substitute value in run-ptest with actual version + sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest + +}