Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com> |
| 3 | Date: Wed, 22 Jan 2020 11:02:17 -0500 |
| 4 | Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest |
| 5 | failure |
| 6 | |
| 7 | Replace ABS_DATADIR with DATADIR and append i386 to dirpath. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [OE specific] |
| 10 | |
| 11 | This OE specific patch applies to kbd v2.2.0 for now, the upstream |
| 12 | made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR |
| 13 | in commit 5b6df5c along with a series of other commits which may or |
| 14 | may not fix this issue. We will find out in future releases. |
| 15 | |
| 16 | Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com> |
| 17 | --- |
| 18 | tests/libkbdfile-test08.c | 6 +++--- |
| 19 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 20 | |
| 21 | diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c |
| 22 | index bf41707..5e287f1 100644 |
| 23 | --- a/tests/libkbdfile-test08.c |
| 24 | +++ b/tests/libkbdfile-test08.c |
| 25 | @@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv) |
| 26 | if (!fp) |
| 27 | kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); |
| 28 | |
| 29 | - const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; |
| 30 | + const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/i386/**", 0 }; |
| 31 | const char *const suffixes[] = { "", ".map", ".kmap", 0 }; |
| 32 | |
| 33 | - const char *expect = ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; |
| 34 | + const char *expect = DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; |
| 35 | |
| 36 | int rc = 0; |
| 37 | |
| 38 | - rc = kbdfile_find((char *)(ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **) suffixes, fp); |
| 39 | + rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **) suffixes, fp); |
| 40 | |
| 41 | if (rc != 0) |
| 42 | kbd_error(EXIT_FAILURE, 0, "unable to find file"); |
| 43 | -- |
| 44 | 2.24.1 |
| 45 | |