From: Qiu Tingting <qi...@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)
- Below is parts of the run log:
START: ptest-runner
2023-10-10T06:30
BEGIN: /usr/lib/kbd/ptest
## --------------------- ##
## kbd 2.6.3 test suite. ##
## --------------------- ##
libkeymap unit tests
PASS: test 01
PASS: test 02
...
libkbdfile unit tests
PASS: test 01
PASS: test 02
...
36 tests were successful.
4 tests were skipped.
DURATION: 1
END: /usr/lib/kbd/ptest
2023-10-10T06:30
STOP: ptest-runner
TOTAL: 1 FAIL: 0
Signed-off-by: Qiu Tingting <qi...@fujitsu.com>
---
.../distro/include/ptest-packagelists.inc | 1 +
meta/recipes-core/kbd/kbd/run-ptest | 10 ++++
meta/recipes-core/kbd/kbd_2.6.3.bb | 46 +++++++++++++++++++
3 files changed, 57 insertions(+)
create mode 100644 meta/recipes-core/kbd/kbd/run-ptest
diff --git a/meta/conf/distro/include/ptest-packagelists.inc
b/meta/conf/distro/include/ptest-packagelists.inc
index fc42f95de2..680b01b3b5 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/kbd/run-ptest
b/meta/recipes-core/kbd/kbd/run-ptest
new file mode 100644
index 0000000000..f02994fa78
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd/run-ptest
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Define test work dir
+WORKDIR=@PTEST_PATH@/tests/
+
+# Run test
+cd ${WORKDIR}
+./atconfig ./testsuite
+./testsuite -c
+./testsuite --am-fmt -k unittest
diff --git a/meta/recipes-core/kbd/kbd_2.6.3.bb
b/meta/recipes-core/kbd/kbd_2.6.3.bb
index 5287781ac1..b272d4746d 100644
--- a/meta/recipes-core/kbd/kbd_2.6.3.bb
+++ b/meta/recipes-core/kbd/kbd_2.6.3.bb
@@ -38,6 +38,52 @@ do_install:append () {
fi
}
+# add for ptest support
+SRC_URI += " \
+ file://run-ptest \
+"
+
+inherit ptest
+
+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
+
+ # 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/
+ for cdir in `ls ${B}/tests/`; do
+ if [ -d ${B}/tests/${cdir} ]; then
+ install -d ${D}${PTEST_PATH}/tests/${cdir}/
+ find ${B}/tests/${cdir}/ -type f -not -name "*.o" -not -name
"Makefile" \
+ -exec install --mode=755 {} ${D}${PTEST_PATH}/tests/${cdir}/ \;
+ else
+ if [ ${cdir} != "Makefile" ]; then
+ install --mode=755 ${B}/tests/${cdir} ${D}${PTEST_PATH}/tests/
+ fi
+ fi
+ done
+
+ # 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
+ cp --preserve=mode,timestamps --no-preserve=ownership -r ${S}/tests/data
${D}${PTEST_PATH}/tests/
+
+ # update PTEST_PATH in run-ptest and atconfig
+ sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest
+ sed -i -e 's,${B},${PTEST_PATH},g' -e 's,/\.\./${PN}-${PV},,g'
${D}${PTEST_PATH}/tests/atconfig
+
+}
+
inherit update-alternatives
ALTERNATIVE:${PN} = "chvt deallocvt fgconsole openvt showkey \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189613):
https://lists.openembedded.org/g/openembedded-core/message/189613
Mute This Topic: https://lists.openembedded.org/mt/102128673/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
