diff options
| author | Muhammad Usama Anjum <usama.anjum@collabora.com> | 2023-10-06 15:07:35 +0500 |
|---|---|---|
| committer | Shuah Khan <skhan@linuxfoundation.org> | 2023-10-06 17:33:37 -0600 |
| commit | dfc033059bb6aa7d219fc25d113b3886131b0a6c (patch) | |
| tree | ffd0ecb36354be32d13ee381bb26dbda0ea3af62 | |
| parent | 0a6fa8f03e1497d3d1bf2e55f1e5b082dda227d4 (diff) | |
| download | linux-dfc033059bb6aa7d219fc25d113b3886131b0a6c.tar.gz linux-dfc033059bb6aa7d219fc25d113b3886131b0a6c.tar.bz2 linux-dfc033059bb6aa7d219fc25d113b3886131b0a6c.zip | |
selftests: capabilities: remove duplicate unneeded defines
These duplicate defines should automatically be picked up from kernel
headers. Use KHDR_INCLUDES to add kernel header files.
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
| -rw-r--r-- | tools/testing/selftests/capabilities/Makefile | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/capabilities/test_execve.c | 8 | ||||
| -rw-r--r-- | tools/testing/selftests/capabilities/validate_cap.c | 8 |
3 files changed, 1 insertions, 17 deletions
diff --git a/tools/testing/selftests/capabilities/Makefile b/tools/testing/selftests/capabilities/Makefile index 6e9d98d457d5..411ac098308f 100644 --- a/tools/testing/selftests/capabilities/Makefile +++ b/tools/testing/selftests/capabilities/Makefile @@ -2,7 +2,7 @@ TEST_GEN_FILES := validate_cap TEST_GEN_PROGS := test_execve -CFLAGS += -O2 -g -std=gnu99 -Wall +CFLAGS += -O2 -g -std=gnu99 -Wall $(KHDR_INCLUDES) LDLIBS += -lcap-ng -lrt -ldl include ../lib.mk diff --git a/tools/testing/selftests/capabilities/test_execve.c b/tools/testing/selftests/capabilities/test_execve.c index df0ef02b4036..e3a352b020a7 100644 --- a/tools/testing/selftests/capabilities/test_execve.c +++ b/tools/testing/selftests/capabilities/test_execve.c @@ -20,14 +20,6 @@ #include "../kselftest.h" -#ifndef PR_CAP_AMBIENT -#define PR_CAP_AMBIENT 47 -# define PR_CAP_AMBIENT_IS_SET 1 -# define PR_CAP_AMBIENT_RAISE 2 -# define PR_CAP_AMBIENT_LOWER 3 -# define PR_CAP_AMBIENT_CLEAR_ALL 4 -#endif - static int nerrs; static pid_t mpid; /* main() pid is used to avoid duplicate test counts */ diff --git a/tools/testing/selftests/capabilities/validate_cap.c b/tools/testing/selftests/capabilities/validate_cap.c index cdfc94268fe6..60b4e7b716a7 100644 --- a/tools/testing/selftests/capabilities/validate_cap.c +++ b/tools/testing/selftests/capabilities/validate_cap.c @@ -9,14 +9,6 @@ #include "../kselftest.h" -#ifndef PR_CAP_AMBIENT -#define PR_CAP_AMBIENT 47 -# define PR_CAP_AMBIENT_IS_SET 1 -# define PR_CAP_AMBIENT_RAISE 2 -# define PR_CAP_AMBIENT_LOWER 3 -# define PR_CAP_AMBIENT_CLEAR_ALL 4 -#endif - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) # define HAVE_GETAUXVAL #endif |