blob: a53433fe57a070c52cd754454bbb8dbc3282f534 [file] [log] [blame]
Brad Bishop9a533952019-12-19 16:39:26 -05001From 1ecdddb2a5b61cf527d1f238f88a9d129239f87a Mon Sep 17 00:00:00 2001
2From: Paul Moore <paul@paul-moore.com>
3Date: Tue, 5 Nov 2019 15:11:11 -0500
4Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls
5
6We recently changed how libseccomp handles syscall numbers that are
7not defined natively, but we missed test #15.
8
9Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
10Signed-off-by: Paul Moore <paul@paul-moore.com>
11
12Upstream-Status: Backport
13[https://github.com/seccomp/libseccomp/commit/1ecdddb2a5b61cf527d1f238f88a9d129239f87a]
14
15Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16---
17 tests/15-basic-resolver.c | 6 +++---
18 1 file changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c
21index 6badef1..0c1eefe 100644
22--- a/tests/15-basic-resolver.c
23+++ b/tests/15-basic-resolver.c
24@@ -55,15 +55,15 @@ int main(int argc, char *argv[])
25 unsigned int arch;
26 char *name = NULL;
27
28- if (seccomp_syscall_resolve_name("open") != __NR_open)
29+ if (seccomp_syscall_resolve_name("open") != __SNR_open)
30 goto fail;
31- if (seccomp_syscall_resolve_name("read") != __NR_read)
32+ if (seccomp_syscall_resolve_name("read") != __SNR_read)
33 goto fail;
34 if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR)
35 goto fail;
36
37 rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat");
38- if (rc != __NR_openat)
39+ if (rc != __SNR_openat)
40 goto fail;
41
42 while ((arch = arch_list[iter++]) != -1) {
43--
442.17.1
45