diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2019-07-19 13:13:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-19 16:19:14 +0100 |
commit | a921c2f9dbefde3592bfe65c80ff1ce973aac89b (patch) | |
tree | 26b492438631afde3c24b777ed7f960a750c26d7 /meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch | |
parent | 161d036569c17d28a1ce625a1c2e258fb6cb18c3 (diff) | |
download | poky-a921c2f9dbefde3592bfe65c80ff1ce973aac89b.tar.gz |
ltp: upgrade 20190115 -> 20190517
Drop the following patches since the issues have been fixed upstream:
0001-file01.sh-Fix-in-was-not-recognized.patch
0001-lapi-Define-TST_ABI-32-64-to-detect-target-type.patch
0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch
0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch
0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch
0026-crash01-Define-_GNU_SOURCE.patch
0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
0034-periodic_output.patch
0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
define-sigrtmin-and-sigrtmax-for-musl.patch
setregid01-security-string-formatting.patch
Refresh the following patches:
0004-build-Add-option-to-select-libc-implementation.patch
0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
0018-guard-mallocopt-with-__GLIBC__.patch
0020-getdents-define-getdents-getdents64-only-for-glibc.patch
0035-fix-test_proc_kill-hang.patch
0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch
0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Add patch:
0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(From OE-Core rev: eb59546c83f4c217de6272a8d3b2fa65e3c84e7f)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch new file mode 100644 index 0000000000..c0f69ecf5f --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 7 Jan 2016 19:40:08 +0000 | ||
4 | Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it | ||
5 | |||
6 | __GLIBC_PREREQ is specific to glibc so it should be checked if it is | ||
7 | defined or not. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
13 | --- | ||
14 | testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ | ||
15 | 1 file changed, 7 insertions(+) | ||
16 | |||
17 | diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c | ||
18 | index dd289cf..76aa969 100644 | ||
19 | --- a/testcases/kernel/syscalls/accept4/accept4_01.c | ||
20 | +++ b/testcases/kernel/syscalls/accept4/accept4_01.c | ||
21 | @@ -38,6 +38,7 @@ | ||
22 | static struct sockaddr_in conn_addr; | ||
23 | static int listening_fd; | ||
24 | |||
25 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) | ||
26 | #if !(__GLIBC_PREREQ(2, 10)) | ||
27 | static int | ||
28 | accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags) | ||
29 | @@ -56,6 +57,7 @@ accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags) | ||
30 | #endif | ||
31 | } | ||
32 | #endif | ||
33 | +#endif | ||
34 | |||
35 | static int create_listening_socket(void) | ||
36 | { | ||
37 | @@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr) | ||
38 | SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr, sizeof(conn_addr)); | ||
39 | addrlen = sizeof(claddr); | ||
40 | |||
41 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) | ||
42 | #if !(__GLIBC_PREREQ(2, 10)) | ||
43 | TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr, &addrlen, | ||
44 | tcase->cloexec | tcase->nonblock)); | ||
45 | @@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr) | ||
46 | TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, | ||
47 | tcase->cloexec | tcase->nonblock)); | ||
48 | #endif | ||
49 | +#else | ||
50 | + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, | ||
51 | + tcase->cloexec | tcase->nonblock)); | ||
52 | +#endif | ||
53 | if (TST_RET == -1) { | ||
54 | if (TST_ERR == ENOSYS) | ||
55 | tst_brk(TCONF, "syscall __NR_accept4 not supported"); | ||
56 | -- | ||
57 | 2.7.4 | ||
58 | |||