Commit f2745dc0 authored by Guillaume Tucker's avatar Guillaume Tucker Committed by Shuah Khan
Browse files

selftests: stop using KSFT_KHDR_INSTALL 



Stop using the KSFT_KHDR_INSTALL flag as installing the kernel headers
from the kselftest Makefile is causing some issues.  Instead, rely on
the headers to be installed directly by the top-level Makefile
"headers_install" make target prior to building kselftest.

Signed-off-by: default avatarGuillaume Tucker <guillaume.tucker@collabora.com>
Tested-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 3bb267a3

tools/testing/selftests/arm64/mte/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ ifeq ($(mte_cc_support),1) 
TEST_GEN_PROGS := $(PROGS)



# Get Kernel headers installed and use them.

KSFT_KHDR_INSTALL := 1

else

    $(warning compiler "$(CC)" does not support the ARMv8.5 MTE extension.)

    $(warning test program "mte" will not be created.)

tools/testing/selftests/arm64/signal/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ PROGS := $(patsubst %.c,%,$(SRCS)) 
TEST_GEN_PROGS := $(notdir $(PROGS))



# Get Kernel headers installed and use them.

KSFT_KHDR_INSTALL := 1



# Including KSFT lib.mk here will also mangle the TEST_GEN_PROGS list

# to account for any OUTPUT target-dirs optionally provided by

tools/testing/selftests/arm64/signal/test_signals.h

+1 −3
Original line number Diff line number Diff line
@@ -9,9 +9,7 @@ 
#include <ucontext.h>



/*

 * Using ARCH specific and sanitized Kernel headers installed by KSFT

 * framework since we asked for it by setting flag KSFT_KHDR_INSTALL

 * in our Makefile.

 * Using ARCH specific and sanitized Kernel headers from the tree.

 */

#include <asm/ptrace.h>

#include <asm/hwcap.h>

tools/testing/selftests/drivers/s390x/uvdevice/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ else 
TEST_GEN_PROGS := test_uvdevice



top_srcdir ?= ../../../../../..

KSFT_KHDR_INSTALL := 1

khdr_dir = $(top_srcdir)/usr/include

LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include

tools/testing/selftests/futex/functional/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ TEST_GEN_FILES := \ 
TEST_PROGS := run.sh



top_srcdir = ../../../../..

KSFT_KHDR_INSTALL := 1

DEFAULT_INSTALL_HDR_PATH := 1

include ../../lib.mk