MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

kbd: make libkbdfile-test08 ptest work for multilib

Browse Source 
This patch fixes kbd ptest libkbdfile-test08 failure in 64-bit images.

```sh
root@intel-x86-64:/usr/lib64/kbd/ptest# ./run-ptest
make: Entering directory '/usr/lib64/kbd/ptest/tests'
make[1]: Entering directory '/usr/lib64/kbd/ptest/tests'
PASS: libkbdfile-test01
PASS: libkbdfile-test02
PASS: libkbdfile-test03
PASS: libkbdfile-test04
PASS: libkbdfile-test05
PASS: libkbdfile-test06
PASS: libkbdfile-test07
FAIL: libkbdfile-test08
PASS: libkbdfile-test09
...
```

`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.

Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent with
what *every other* kbd test is doing.

The test searches DATADIR recursively for a file named `test0.map`,
but it finds the wrong file at
    `/findfile/test_0/keymaps/test0.map`,
while it actually needs
    `/findfile/test_0/keymaps/i386/qwerty/test0.map`.

Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
    finds the right test file.

(From OE-Core rev: bdcda2c4ff3c96f686b8bd30cd17361ff3722a0f)

Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mingde (Matthew) Zeng 2020-01-22 15:20:03 -05:00 committed by Richard Purdie
parent a708aa347d
commit 1e709614b5
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch Normal file
View File

@ -0,0 +1,45 @@
From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001
From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com>
Date: Wed, 22 Jan 2020 11:02:17 -0500
Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest
failure
Replace ABS_DATADIR with DATADIR and append i386 to dirpath.
Upstream-Status: Inappropriate [OE specific]
This OE specific patch applies to kbd v2.2.0 for now, the upstream
made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR
in commit 5b6df5c along with a series of other commits which may or
may not fix this issue. We will find out in future releases.
Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com>
---
tests/libkbdfile-test08.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c
index bf41707..5e287f1 100644
--- a/tests/libkbdfile-test08.c
+++ b/tests/libkbdfile-test08.c
@@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv)
if (!fp)
kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile");
- const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 };
+ const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/i386/**", 0 };
const char *const suffixes[] = { "", ".map", ".kmap", 0 };
- const char *expect = ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map";
+ const char *expect = DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map";
int rc = 0;
- rc = kbdfile_find((char *)(ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **) suffixes, fp);
+ rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **) suffixes, fp);
if (rc != 0)
kbd_error(EXIT_FAILURE, 0, "unable to find file");
--
2.24.1

1
meta/recipes-core/kbd/kbd_2.2.0.bb
View File

@ -16,6 +16,7 @@ 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)} \
file://0001-analyze.l-add-missing-string-format.patch \
file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \
"
SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"