Skip to contentSkip to conversation

kbd: create ptest sub-package

PATCH New [email protected] 1 participant 2 messages Sep 30, 2016

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover kbd: create ptest sub-package

From: Kai Kang <[email protected]>

The following changes since commit 5d8a968ecdf40babe452b0ac63d94a7a163710ae:

dev-manual: Applied review changes to GNU debugging section. (2016-09-28 15:02:33 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kangkai/kbd
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/kbd

Kai Kang (1):
kbd: create ptest sub-package

 meta/recipes-core/kbd/kbd/run-ptest                |  4 ++
 .../kbd/kbd/set-proper-path-of-resources.patch     | 56 ++++++++++++++++++++++
 meta/recipes-core/kbd/kbd_2.0.3.bb                 | 19 ++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 meta/recipes-core/kbd/kbd/run-ptest
 create mode 100644 meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 1/1 kbd: create ptest sub-package

From: Kai Kang <[email protected]>

Create kbd-ptest sub-package:

* add file run-ptest and runtime dependency make
* modify installed Makefile to disable remake Makefile and the test cases when run the ptest
* add patch to set proper path for test cases to get resource files

Signed-off-by Kai Kang <[email protected]>
---
 meta/recipes-core/kbd/kbd/run-ptest                |  4 ++
 .../kbd/kbd/set-proper-path-of-resources.patch     | 56 ++++++++++++++++++++++
 meta/recipes-core/kbd/kbd_2.0.3.bb                 | 19 ++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 meta/recipes-core/kbd/kbd/run-ptest
 create mode 100644 meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
meta/recipes-core/kbd/kbd/run-ptest new file +4 -0
new file mode 100644
index 0000000..7a2d205
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CURDIR=$(dirname `readlink -f $0`)
+make -k -C ${CURDIR}/tests check-TESTS
meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch new file +56 -0

56 lines not on this page · raw message

meta/recipes-core/kbd/kbd_2.0.3.bb +19 -0
index ea1e0b4..54d1683 100644
@@ -11,6 +11,8 @@ RPROVIDES_${PN} = "console-tools"
 RCONFLICTS_${PN} = "console-tools"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
+           file://run-ptest \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \
           "
 
 SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208"

@@ -19,6 +21,21 @@ SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb46
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
 
+do_compile_ptest() {
+    oe_runmake -C ${B}/tests dumpkeys-fulltable alt-is-meta
+}
+
+do_install_ptest() {
+    install -D ${B}/tests/Makefile ${D}${PTEST_PATH}/tests/Makefile
+    sed -i -e '/Makefile:/,/^$/d' -e '/%: %.in/,/^$/d' \
+	-e '/libkeymap_.*_SOURCES =/d' -e '/$(EXEEXT):/,/^$/d' ${D}${PTEST_PATH}/tests/Makefile
+
+    find ${B}/tests -executable -exec install {} ${D}${PTEST_PATH}/tests \;
+    find ${S}/tests \( -name \*.map -o -name \*.bin -o -name \*.output \) -exec install {} ${D}${PTEST_PATH}/tests \;
+
+    install -D -m 755 ${S}/config/test-driver ${D}${PTEST_PATH}/config/test-driver
+}
+
 PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
 
 FILES_${PN}-consolefonts = "${datadir}/consolefonts"

@@ -26,6 +43,8 @@ FILES_${PN}-consoletrans = "${datadir}/consoletrans"
 FILES_${PN}-keymaps = "${datadir}/keymaps"
 FILES_${PN}-unimaps = "${datadir}/unimaps"
 
+RDEPENDS_${PN}-ptest = "make"
+
 inherit update-alternatives
 
 ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt"
Signature · 1 line
2.9.3