diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-06-12 01:25:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:01 +0100 |
commit | 559dba8cc0090524da2599fb0818bf8e8bf4d3c8 (patch) | |
tree | 76ed2d150ccabdf3c5372659ff450cc80138ac59 /meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch | |
parent | 632b7738e618af4ac9d08ea0b5346c8b705a82b3 (diff) | |
download | poky-559dba8cc0090524da2599fb0818bf8e8bf4d3c8.tar.gz |
strace: 4.11 -> 4.12
* Remove backported patches:
0001-Move-gcc-compat-macros-to-gcc_compat.h.patch
0001-arc-metag-nios2-or1k-tile-fix-build.patch
0001-scm_rights-fd.test-rewrite-without-fork.patch
0001-tests-introduce-libtests.patch
0001-tests-scm_rights.c-use-libtests.patch
* Update update-gawk-paths.patch
(From OE-Core rev: 53b3d06d24ad711241fe706d100d888a06669d57)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch')
-rw-r--r-- | meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch b/meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch deleted file mode 100644 index 3fbab8b66f..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 339a15b619b479c63cafba21d5fc359e613d9ee8 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Dmitry V. Levin" <ldv@altlinux.org> | ||
3 | Date: Mon, 4 Jan 2016 23:53:31 +0000 | ||
4 | Subject: [PATCH] tests/scm_rights.c: use libtests | ||
5 | |||
6 | * tests/scm_rights.c (main): Use perror_msg_and_fail and perror_msg_and_skip. | ||
7 | --- | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Upstream-Status: Backport | ||
10 | |||
11 | tests/scm_rights.c | 12 ++++++++---- | ||
12 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/tests/scm_rights.c b/tests/scm_rights.c | ||
15 | index c41444f..1e5e850 100644 | ||
16 | --- a/tests/scm_rights.c | ||
17 | +++ b/tests/scm_rights.c | ||
18 | @@ -1,5 +1,5 @@ | ||
19 | /* | ||
20 | - * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
21 | + * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org> | ||
22 | * All rights reserved. | ||
23 | * | ||
24 | * Redistribution and use in source and binary forms, with or without | ||
25 | @@ -25,6 +25,7 @@ | ||
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
27 | */ | ||
28 | |||
29 | +#include "tests.h" | ||
30 | #include <assert.h> | ||
31 | #include <string.h> | ||
32 | #include <stdlib.h> | ||
33 | @@ -48,12 +49,15 @@ int main(int ac, const char **av) | ||
34 | (void) close(3); | ||
35 | |||
36 | int sv[2]; | ||
37 | - assert(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); | ||
38 | + if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) | ||
39 | + perror_msg_and_skip("socketpair"); | ||
40 | int one = 1; | ||
41 | - assert(setsockopt(sv[0], SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) == 0); | ||
42 | + if (setsockopt(sv[0], SOL_SOCKET, SO_PASSCRED, &one, sizeof(one))) | ||
43 | + perror_msg_and_skip("setsockopt"); | ||
44 | |||
45 | pid_t pid = fork(); | ||
46 | - assert(pid >= 0); | ||
47 | + if (pid < 0) | ||
48 | + perror_msg_and_fail("fork"); | ||
49 | |||
50 | if (pid) { | ||
51 | assert(close(sv[0]) == 0); | ||
52 | -- | ||
53 | 1.9.1 | ||
54 | |||