It takes under 10 seconds to run the suite. Executed succesfully on x86-64, with musl and glibc.
The recipe requires pam DISTRO_FEATURE to be present. Signed-off-by: Gyorgy Sarvari <[email protected]> --- .../include/ptest-packagelists-meta-oe.inc | 1 + meta-oe/recipes-support/xrdp/xrdp/run-ptest | 13 +++++++ meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb | 37 ++++++++++++++++++- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/run-ptest diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index bf3f92057f..52ca06ae43 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -53,6 +53,7 @@ PTESTS_FAST_META_OE = "\ utf8proc \ uthash \ xmlsec1 \ + xrdp \ zeromq \ cjson \ libplist \ diff --git a/meta-oe/recipes-support/xrdp/xrdp/run-ptest b/meta-oe/recipes-support/xrdp/xrdp/run-ptest new file mode 100644 index 0000000000..4db66da65e --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/run-ptest @@ -0,0 +1,13 @@ +#!/bin/sh + +RESULT=0 +cd tests +for t in $(find . -type f -executable); do + ./$t > $t.out + ret=$? + if [ $ret -ne 0 ]; then + RESULT=$ret + fi + sed -e "s/^ok/PASS: /g" -e "s/^not ok/FAIL: /g" ./$t.out +done +exit $RESULT diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb index cd45d27fe4..8203ada8e5 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ " -inherit features_check autotools pkgconfig useradd systemd +inherit features_check autotools pkgconfig useradd systemd ptest DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" @@ -12,6 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://xrdp.sysconfig \ + file://run-ptest \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ file://0001-mark-count-with-unused-attribute.patch \ @@ -25,8 +26,9 @@ UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" CFLAGS += " -Wno-deprecated-declarations" -PACKAGECONFIG ??= "fuse" +PACKAGECONFIG ??= "fuse ${@bb.utils.contains('PTEST_ENABLED', '1', 'test', '', d)}" PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse3" +PACKAGECONFIG[test] = " --enable-tests, , libcheck cmocka" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system xrdp" @@ -77,6 +79,37 @@ do_install:append() { chown xrdp:xrdp ${D}${sysconfdir}/xrdp } +do_compile_ptest() { + for testdir in $(find ./tests -type d -mindepth 1); do + cd $testdir + echo 'buildtest-TESTS: $(check_PROGRAMS)' >> Makefile + # change the test-data folder to ./data instead of ${S} + sed -i 's|-D TOP_SRCDIR=[^ ]*|-D TOP_SRCDIR=\\"./data\\"|' Makefile + # another test data folder redirection + sed -i 's|-D IMAGEDIR=[^ ]*|-D IMAGEDIR=\\"./data\\"|' Makefile + # and another + sed -i 's|-DXRDP_TOP_SRCDIR=[^ ]*|-DXRDP_TOP_SRCDIR=\\"..\\"|' Makefile + oe_runmake buildtest-TESTS + cd - + done +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/xrdp/gfx + install -d ${D}${PTEST_PATH}/tests/data/xrdp + for testbin in $(find ./tests -type f -executable -mindepth 3); do + install $testbin ${D}${PTEST_PATH}/tests/ + done + install -m 666 ${S}/xrdp/xrdp256.bmp ${D}${PTEST_PATH}/tests/data/xrdp/ + install -m 666 ${S}/xrdp/ad256.bmp ${D}${PTEST_PATH}/tests/data/xrdp/ + install -m 666 ${S}/tests/xrdp/*.bmp ${D}${PTEST_PATH}/tests/data/ + install -m 666 ${S}/tests/xrdp/test1.jpg ${D}${PTEST_PATH}/tests/data/ + install -m 666 ${S}/tests/xrdp/test_alpha_blend.png ${D}${PTEST_PATH}/tests/data/ + install -m 666 ${S}/tests/xrdp/gfx/* ${D}${PTEST_PATH}/tests/xrdp/gfx/ +} + +RDEPENDS:${PN}-ptest += "imlib2-loaders" + SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" pkg_postinst:${PN}() {
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122063): https://lists.openembedded.org/g/openembedded-devel/message/122063 Mute This Topic: https://lists.openembedded.org/mt/116475499/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
