summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-05 15:01:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-07 12:15:59 +0100
commitb36a754d46977a8bb25c472d64df29dbdabc8a90 (patch)
tree5af046703427b8dbf9ed2b4bef5596e333bf936a /meta
parentef5725ddfc9df83e6bf78756cc60bc883dd741f1 (diff)
downloadpoky-b36a754d46977a8bb25c472d64df29dbdabc8a90.tar.gz
libinput: add ptest
The test takes about 17 minutes, and fully passes. (From OE-Core rev: adc4dbb748c01b731035a759de7cd798d7860d0c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/ptest-packagelists.inc1
-rw-r--r--meta/recipes-graphics/wayland/libinput/run-ptest9
-rw-r--r--meta/recipes-graphics/wayland/libinput_1.15.2.bb16
3 files changed, 23 insertions, 3 deletions
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 = "\
72 glib-2.0-ptest \ 72 glib-2.0-ptest \
73 gstreamer1.0-ptest \ 73 gstreamer1.0-ptest \
74 libevent-ptest \ 74 libevent-ptest \
75 libinput-ptest \
75 lttng-tools-ptest \ 76 lttng-tools-ptest \
76 openssh-ptest \ 77 openssh-ptest \
77 openssl-ptest \ 78 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 @@
1#!/bin/sh
2
3/usr/libexec/libinput/libinput-test-suite
4if [ $? -eq 0 ]; then
5 echo 'PASS: libinput-test-suite'
6else
7 echo 'FAIL: libinput-test-suite'
8fi
9
diff --git a/meta/recipes-graphics/wayland/libinput_1.15.2.bb b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
index 810532774e..fd236f75dd 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"
10LICENSE = "MIT" 10LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" 11LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
12 12
13DEPENDS = "libevdev udev mtdev" 13DEPENDS = "libevdev udev mtdev libcheck"
14 14
15SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ 15SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
16 file://run-ptest \
16 file://determinism.patch \ 17 file://determinism.patch \
17 " 18 "
18SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" 19SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
@@ -20,7 +21,15 @@ SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834
20 21
21UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" 22UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
22 23
23inherit meson pkgconfig lib_package 24inherit meson pkgconfig lib_package ptest
25
26# Patch out build directory, otherwise it leaks into ptest binary
27do_configure_append() {
28 sed -i -e "s,${WORKDIR},,g" config.h
29 if [ -e "litest-config.h" ]; then
30 sed -i -e "s,${WORKDIR},,g" litest-config.h
31 fi
32}
24 33
25PACKAGECONFIG ??= "" 34PACKAGECONFIG ??= ""
26PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" 35PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
@@ -30,7 +39,7 @@ UDEVDIR = "`pkg-config --variable=udevdir udev`"
30 39
31EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ 40EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \
32 -Ddocumentation=false \ 41 -Ddocumentation=false \
33 -Dtests=false \ 42 ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \
34 -Dzshcompletiondir=no" 43 -Dzshcompletiondir=no"
35 44
36# package name changed in 1.8.1 upgrade: make sure package upgrades work 45# package name changed in 1.8.1 upgrade: make sure package upgrades work
@@ -38,3 +47,4 @@ RPROVIDES_${PN} = "libinput"
38RREPLACES_${PN} = "libinput" 47RREPLACES_${PN} = "libinput"
39RCONFLICTS_${PN} = "libinput" 48RCONFLICTS_${PN} = "libinput"
40 49
50FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite"