mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 05:04:09 +08:00
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: Guillaume Tucker <guillaume.tucker@collabora.com> Tested-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
parent
3bb267a361
commit
f2745dc0ba
@ -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.)
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -4,7 +4,6 @@ include ../../../build/Build.include
|
||||
all:
|
||||
|
||||
top_srcdir = ../../../..
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
|
||||
# For cross-builds to work, UNAME_M has to map to ARCH and arch specific
|
||||
# directories and targets in this Makefile. "uname -m" doesn't map to
|
||||
|
@ -8,7 +8,6 @@ TEST_GEN_PROGS := $(src_test:.c=)
|
||||
|
||||
TEST_GEN_PROGS_EXTENDED := true
|
||||
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
OVERRIDE_TARGETS := 1
|
||||
include ../lib.mk
|
||||
|
||||
|
@ -62,7 +62,6 @@ TEST_PROGS += test_vxlan_vnifiltering.sh
|
||||
|
||||
TEST_FILES := settings
|
||||
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
include ../lib.mk
|
||||
|
||||
include bpf/Makefile
|
||||
|
@ -1,7 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
top_srcdir = ../../../../..
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
|
||||
CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
|
||||
|
||||
|
@ -5,7 +5,6 @@ top_srcdir = $(abspath ../../../..)
|
||||
APIDIR := $(top_scrdir)/include/uapi
|
||||
TEST_GEN_FILES = action.o
|
||||
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
include ../lib.mk
|
||||
|
||||
PROBE := $(shell $(LLC) -march=bpf -mcpu=probe -filetype=null /dev/null 2>&1)
|
||||
|
@ -94,7 +94,6 @@ TEST_PROGS := run_vmtests.sh
|
||||
TEST_FILES := test_vmalloc.sh
|
||||
TEST_FILES += test_hmm.sh
|
||||
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
include ../lib.mk
|
||||
|
||||
$(OUTPUT)/madv_populate: vm_util.c
|
||||
|
Loading…
Reference in New Issue
Block a user