From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail5.wrs.com (mail5.windriver.com [192.103.53.11]) by mail.openembedded.org (Postfix) with ESMTP id 2B7067F3BA for ; Wed, 22 Jan 2020 18:48:17 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id 00MIlvGb005073 (version=TLSv1 cipher=AES256-SHA bits=256 verify=FAIL) for ; Wed, 22 Jan 2020 10:48:08 -0800 Received: from mzeng (128.224.141.67) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.468.0; Wed, 22 Jan 2020 10:47:47 -0800 User-agent: mu4e 1.3.6; emacs 28.0.50 From: "Mingde (Matthew) Zeng" To: Date: Wed, 22 Jan 2020 13:47:36 -0500 Message-ID: <87a76fcoqf.fsf@windriver.com> MIME-Version: 1.0 X-Originating-IP: [128.224.141.67] Subject: [PATCH] kbd: fix ptest libkbdfile-test08 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 18:48:17 -0000 Content-Type: text/plain `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/i386/qwerty/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. Signed-off-by: Matthew Zeng --- ...append-i386-to-fix-libkbdfile-test08.patch | 44 +++++++++++++++++++ meta/recipes-core/kbd/kbd_2.2.0.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch diff --git a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch new file mode 100644 index 0000000000..ec40764c1d --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch @@ -0,0 +1,44 @@ +From 92c0fb720cf7b9966494e5eaa1f7a4ea8e0a34d2 Mon Sep 17 00:00:00 2001 +From: "Mingde (Matthew) Zeng" +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 which may or may not fix this + issue, we will find out in future releases. + +Signed-off-by: Matthew Zeng +--- + tests/libkbdfile-test08.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c +index bf41707..993fedc 100644 +--- a/tests/libkbdfile-test08.c ++++ b/tests/libkbdfile-test08.c +@@ -14,14 +14,12 @@ 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); ++ int 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 + diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb index df9b0bb90b..e13cea7634 100644 --- a/meta/recipes-core/kbd/kbd_2.2.0.bb +++ b/meta/recipes-core/kbd/kbd_2.2.0.bb @@ -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" -- 2.24.0