From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: "qiutt@fujitsu.com" <qiutt@fujitsu.com>,
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH V4] kbd: Add ptest support
Date: Thu, 29 Jun 2023 11:16:04 +0100 [thread overview]
Message-ID: <bae9ee0a8cf98063e0c268e8656c1463458ca2da.camel@linuxfoundation.org> (raw)
In-Reply-To: <1685601998-1446-1-git-send-email-qiutt@fujitsu.com>
On Thu, 2023-06-01 at 14:46 +0800, qiutt@fujitsu.com wrote:
> From: Qiu Tingting <qiutt@fujitsu.com>
>
> Add a ptest for kbd
> - It is taking around 1s to execute with kvm, so added it to PTESTS_FAST
> - It contains libkeymap unit tests(27 cases) and libkbdfile unit tests(13 cases)
>
> Signed-off-by: Qiu Tingting <qiutt@fujitsu.com>
> ---
> .../distro/include/ptest-packagelists.inc | 1 +
> meta/recipes-core/kbd/files/run-ptest | 11 +++
> meta/recipes-core/kbd/kbd_2.5.1.bb | 74 ++++++++++++++++++-
> 3 files changed, 85 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-core/kbd/files/run-ptest
>
> diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
> index da9153b998..7d5883604c 100644
> --- a/meta/conf/distro/include/ptest-packagelists.inc
> +++ b/meta/conf/distro/include/ptest-packagelists.inc
> @@ -27,6 +27,7 @@ PTESTS_FAST = "\
> gzip \
> json-c \
> json-glib \
> + kbd \
> libconvert-asn1-perl \
> liberror-perl \
> libgpg-error\
> diff --git a/meta/recipes-core/kbd/files/run-ptest b/meta/recipes-core/kbd/files/run-ptest
> new file mode 100644
> index 0000000000..3b154c4d73
> --- /dev/null
> +++ b/meta/recipes-core/kbd/files/run-ptest
> @@ -0,0 +1,11 @@
> +#!/bin/sh
> +
> +# Define test work dir
> +WORKDIR=@PTEST_PATH@/tests/
> +
> +# Run test
> +cd ${WORKDIR}
> +
> +./testsuite -k unittest | sed -e '/[0-9]:/s/://' \
> + -e '/ ok/s/^/PASS: /;/ FAILED/s/^/FAIL: /;/ skipped/s/^/SKIP: /' \
> + -e '/ ok/s/ ok.*//;/ skipped/s/ skipped.*//;/ FAILED/s/ FAILED.*//'
> diff --git a/meta/recipes-core/kbd/kbd_2.5.1.bb b/meta/recipes-core/kbd/kbd_2.5.1.bb
> index 7662b8f685..283617aaaa 100644
> --- a/meta/recipes-core/kbd/kbd_2.5.1.bb
> +++ b/meta/recipes-core/kbd/kbd_2.5.1.bb
> @@ -5,7 +5,7 @@ DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux
> LICENSE = "GPL-2.0-or-later"
> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
> -inherit autotools gettext pkgconfig
> +inherit autotools gettext pkgconfig ptest
>
> DEPENDS += "flex-native"
>
> @@ -14,6 +14,7 @@ RPROVIDES:${PN} = "console-tools"
> RCONFLICTS:${PN} = "console-tools"
>
> SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
> + file://run-ptest \
> "
>
> SRC_URI[sha256sum] = "ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683"
> @@ -45,3 +46,74 @@ ALTERNATIVE:${PN} = "chvt deallocvt fgconsole openvt showkey \
> ALTERNATIVE_PRIORITY = "100"
>
> BBCLASSEXTEND = "native"
> +
> +do_compile_ptest() {
> + # update DATADIR in Makefile
> + sed -i 's,-DDATADIR=.*,-DDATADIR=\\\"${PTEST_PATH}/tests\\\" \\,g' ${B}/tests/libkeymap/Makefile
> + sed -i 's,-DDATADIR=.*,-DDATADIR=\\\"${PTEST_PATH}/tests\\\" \\,g' ${B}/tests/helpers/Makefile
> + sed -i 's,-DDATADIR=.*,-DDATADIR=\\\"${PTEST_PATH}/tests\\\" \\,g' ${B}/tests/libkbdfile/Makefile
> +
> + # unset -D_TIME_BITS=64 in Makefile
> + sed -i 's,-D_TIME_BITS=64,,g' ${B}/tests/libtswrap/Makefile
> +
> + # recompile tests
> + oe_runmake -C ${B}/tests/ clean
> + oe_runmake -C ${B}/tests/
> +}
> +
> +do_install_ptest() {
> + # install files from build directory
> + install -d ${D}${PTEST_PATH}/tests/
> + install --mode=755 ${B}/tests/atconfig ${D}${PTEST_PATH}/tests/
> + install --mode=755 ${B}/tests/testsuite ${D}${PTEST_PATH}/tests/
> + install -d ${D}${PTEST_PATH}/tests/libkeymap/
> + find ${B}/tests/libkeymap/ -type f -not -name "*.o" -not -name "Makefile" \
> + -exec install --mode=755 {} ${D}${PTEST_PATH}/tests/libkeymap/ \;
> + install -d ${D}${PTEST_PATH}/tests/helpers/
> + find ${B}/tests/helpers/ -type f -not -name "*.o" -not -name "Makefile" \
> + -exec install --mode=755 {} ${D}${PTEST_PATH}/tests/helpers/ \;
> + install -d ${D}${PTEST_PATH}/tests/libkbdfile/
> + find ${B}/tests/libkbdfile/ -type f -not -name "*.o" -not -name "Makefile" \
> + -exec install --mode=755 {} ${D}${PTEST_PATH}/tests/libkbdfile/ \;
> + install -d ${D}${PTEST_PATH}/src/
> + install --mode=755 ${B}/src/loadkeys ${D}${PTEST_PATH}/src/
> +
> + # install files from src/data directory
> + install -d ${D}${PTEST_PATH}/data/keymaps/i386/qwerty/
> + install ${S}/data/keymaps/i386/qwerty/defkeymap.map ${D}${PTEST_PATH}/data/keymaps/i386/qwerty/
> +
> + # install files from src/tests/data directory
> + install -d ${D}${PTEST_PATH}/tests/data/
> + install -d ${D}${PTEST_PATH}/tests/data/libkeymap/
> + install ${S}/tests/data/libkeymap/* ${D}${PTEST_PATH}/tests/data/libkeymap/
> + install -d ${D}${PTEST_PATH}/tests/data/alt-is-meta/
> + install ${S}/tests/data/alt-is-meta/* ${D}${PTEST_PATH}/tests/data/alt-is-meta/
> + install -d ${D}${PTEST_PATH}/tests/data/bkeymap-2.0.4/
> + install ${S}/tests/data/bkeymap-2.0.4/* ${D}${PTEST_PATH}/tests/data/bkeymap-2.0.4/
> + install -d ${D}${PTEST_PATH}/tests/data/dumpkeys-mktable/
> + install ${S}/tests/data/dumpkeys-mktable/* ${D}${PTEST_PATH}/tests/data/dumpkeys-mktable/
> + install -d ${D}${PTEST_PATH}/tests/data/dumpkeys-fulltable/
> + install ${S}/tests/data/dumpkeys-fulltable/* ${D}${PTEST_PATH}/tests/data/dumpkeys-fulltable/
> + install -d ${D}${PTEST_PATH}/tests/data/findfile/test_1/consolefonts/
> + install ${S}/tests/data/findfile/test_1/consolefonts/* ${D}${PTEST_PATH}/tests/data/findfile/test_1/consolefonts/
> + install -d ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/include/
> + install ${S}/tests/data/findfile/test_0/keymaps/test0.map ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/
> + install ${S}/tests/data/findfile/test_0/keymaps/include/* ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/include/
> + install -d ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/i386/include/
> + install ${S}/tests/data/findfile/test_0/keymaps/i386/include/* ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/i386/include/
> + install -d ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/i386/qwerty/
> + install ${S}/tests/data/findfile/test_0/keymaps/i386/qwerty/* ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/i386/qwerty/
> + install -d ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/i386/qwertz/
> + install ${S}/tests/data/findfile/test_0/keymaps/i386/qwertz/* ${D}${PTEST_PATH}/tests/data/findfile/test_0/keymaps/i386/qwertz/
> + install -d ${D}${PTEST_PATH}/tests/data/keymaps/i386/qwerty/
> + install ${S}/tests/data/keymaps/i386/qwerty/* ${D}${PTEST_PATH}/tests/data/keymaps/i386/qwerty/
> + install -d ${D}${PTEST_PATH}/tests/data/keymaps/i386/include/
> + install ${S}/tests/data/keymaps/i386/include/* ${D}${PTEST_PATH}/tests/data/keymaps/i386/include/
> + install -d ${D}${PTEST_PATH}/tests/data/keymaps/include/
> + install ${S}/tests/data/keymaps/include/* ${D}${PTEST_PATH}/tests/data/keymaps/include/
I'm a bit worried about the relatively large list of files we have here
which looks like it will be sensitive to version upgrades and the test
data changing.
Could we copy in files and then set ownership with some kind of
wildcard instead to simplify this?
Cheers,
Richard
prev parent reply other threads:[~2023-06-29 10:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 6:46 [PATCH V4] kbd: Add ptest support qiutt
2023-06-29 9:35 ` [OE-core] " Alexandre Belloni
2023-06-29 10:16 ` Richard Purdie [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bae9ee0a8cf98063e0c268e8656c1463458ca2da.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
--cc=qiutt@fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox