Commit dfc03305 authored by Muhammad Usama Anjum's avatar Muhammad Usama Anjum Committed by Shuah Khan
Browse files

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: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 0a6fa8f0

tools/testing/selftests/capabilities/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/testing/selftests/capabilities/test_execve.c

+0 −8
Original line number Diff line number Diff line
@@ -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 */

tools/testing/selftests/capabilities/validate_cap.c

+0 −8
Original line number Diff line number Diff line
@@ -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