Re: [OE-core] [PATCH 01/17] libinput: add ptest

Richard Purdie
2020-05-05T09:43:04Z

On Sun, 2020-05-03 at 18:25 +0200, Alexander Kanavin wrote:
> The test takes about 17 minutes, and fully passes.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/conf/distro/include/ptest-packagelists.inc | 1 +
> meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++
> meta/recipes-graphics/wayland/libinput_1.15.2.bb | 14 +++++++++++---
> 3 files changed, 21 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
>
> diff --git a/meta/conf/distro/include/ptest-packagelists.inc
> b/meta/conf/distro/include/ptest-packagelists.inc
> index c13ff724b1..ab44757a11 100644
> --- a/meta/conf/distro/include/ptest-packagelists.inc
> +++ b/meta/conf/distro/include/ptest-packagelists.inc
> @@ -72,6 +72,7 @@ PTESTS_SLOW = "\
> glib-2.0-ptest \
> gstreamer1.0-ptest \
> libevent-ptest \
> + libinput-ptest \
> lttng-tools-ptest \
> openssh-ptest \
> openssl-ptest \
> diff --git a/meta/recipes-graphics/wayland/libinput/run-ptest
> b/meta/recipes-graphics/wayland/libinput/run-ptest
> new file mode 100644
> index 0000000000..5a84c568b9
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/libinput/run-ptest
> @@ -0,0 +1,9 @@
> +#!/bin/sh
> +
> +/usr/libexec/libinput/libinput-test-suite
> +if [ $? -eq 0 ]; then
> + echo 'PASS: libinput-test-suite'
> +else
> + echo 'FAIL: libinput-test-suite'
> +fi
> +
> diff --git a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> index 810532774e..31652cc342 100644
> --- a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> +++ b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> @@ -10,9 +10,10 @@ SECTION = "libs"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
>
> -DEPENDS = "libevdev udev mtdev"
> +DEPENDS = "libevdev udev mtdev libcheck"
>
> SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
> + file://run-ptest \
> file://determinism.patch \
> "
> SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
> @@ -20,7 +21,13 @@ SRC_URI[sha256sum] =
> "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834
>
> UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
>
> -inherit meson pkgconfig lib_package
> +inherit meson pkgconfig lib_package ptest
> +
> +# Patch out build directory, otherwise it leaks into ptest binary
> +do_configure_append() {
> + sed -i -e "s,${WORKDIR},,g" config.h
> + sed -i -e "s,${WORKDIR},,g" litest-config.h
> +}
>

Nearly :)

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1869

(I think its failing when ptests aren't enabled)

Cheers,

Richard