Commit e9d48abb authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

kselftests: hid: fix missing headers_install step 



The Makefile was assuming that headers_install was already done in
the top source directory, and was searching for installed uapi headers
there.
Unfortunately this is not the case and we need to manually call that step.

To do so, reorder the declaration of the variables, and reuses top_srcdir
provided by lib.mk

Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/all/202212060216.a6X8Py5H-lkp@intel.com/#t


Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarJiri Kosina <jkosina@suse.cz>
Link: https://lore.kernel.org/r/20221206145936.922196-6-benjamin.tissoires@redhat.com
parent d0b93a0d

tools/testing/selftests/hid/Makefile

+12 −14
Original line number Diff line number Diff line
@@ -7,17 +7,9 @@ include ../../../scripts/Makefile.include 


CXX ?= $(CROSS_COMPILE)g++



CURDIR := $(abspath .)

TOOLSDIR := $(abspath ../../..)

TOP_SRCDIR = $(CURDIR)/../../../..

KHDR_INCLUDES := $(TOP_SRCDIR)/usr/include

LIBDIR := $(TOOLSDIR)/lib

BPFDIR := $(LIBDIR)/bpf

TOOLSINCDIR := $(TOOLSDIR)/include

BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool

HOSTPKG_CONFIG := pkg-config



CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(KHDR_INCLUDES)

CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(KHDR_INCLUDES) -I$(OUTPUT)

LDLIBS += -lelf -lz -lrt -lpthread



# Silence some warnings when compiled with clang
@@ -53,9 +45,15 @@ endef 


include ../lib.mk



TOOLSDIR := $(top_srcdir)/tools

LIBDIR := $(TOOLSDIR)/lib

BPFDIR := $(LIBDIR)/bpf

TOOLSINCDIR := $(TOOLSDIR)/include

BPFTOOLDIR := $(TOOLSDIR)/bpf/bpftool

SCRATCH_DIR := $(OUTPUT)/tools

BUILD_DIR := $(SCRATCH_DIR)/build

INCLUDE_DIR := $(SCRATCH_DIR)/include

KHDR_INCLUDES := $(SCRATCH_DIR)/uapi/include

BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a

ifneq ($(CROSS_COMPILE),)

HOST_BUILD_DIR		:= $(BUILD_DIR)/host
@@ -122,7 +120,6 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ 
		    prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install-bin



$(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)		       \

	   $(KHDR_INCLUDES)/linux/bpf.h					       \

	   | $(BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \

		    EXTRA_CFLAGS='-g -O0'				       \
@@ -130,7 +127,6 @@ $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ 


ifneq ($(BPFOBJ),$(HOST_BPFOBJ))

$(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)		       \

		$(KHDR_INCLUDES)/linux/bpf.h					       \

		| $(HOST_BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR)                             \

		    EXTRA_CFLAGS='-g -O0' ARCH= CROSS_COMPILE=		       \
@@ -147,6 +143,9 @@ else 
	$(Q)cp "$(VMLINUX_H)" $@

endif



$(KHDR_INCLUDES)/linux/hid.h: $(top_srcdir)/include/uapi/linux/hid.h

	$(MAKE) -C $(top_srcdir) INSTALL_HDR_PATH=$(SCRATCH_DIR)/uapi headers_install



$(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids	\

		       $(TOOLSDIR)/bpf/resolve_btfids/main.c	\

		       $(TOOLSDIR)/lib/rbtree.c			\
@@ -178,8 +177,7 @@ MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian) 


CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))

BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) 		\

	     -I$(INCLUDE_DIR) -I$(CURDIR) -I$(KHDR_INCLUDES)		\

	     -I$(abspath $(OUTPUT)/../usr/include)

	     -I$(INCLUDE_DIR)



CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \

	       -Wno-compare-distinct-pointer-types
@@ -225,7 +223,7 @@ $(BPF_SKELS): %.skel.h: %.bpf.o $(BPFTOOL) | $(OUTPUT) 
	$(Q)$(BPFTOOL) gen object $(<:.o=.linked1.o) $<

	$(Q)$(BPFTOOL) gen skeleton $(<:.o=.linked1.o) name $(notdir $(<:.bpf.o=)) > $@



$(OUTPUT)/%:%.c $(BPF_SKELS)

$(OUTPUT)/%:%.c $(BPF_SKELS) $(KHDR_INCLUDES)/linux/hid.h

	$(call msg,BINARY,,$@)

	$(Q)$(LINK.c) $^ $(LDLIBS) -o $@