Commit 90b6b686 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-6.0-rc2' of... 

Merge tag 'linux-kselftest-next-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fix from Shuah Khan:

 - fix landlock test build regression

* tag 'linux-kselftest-next-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/landlock: fix broken include of linux/landlock.h
parents 0de277d4 f1227dc7

tools/testing/selftests/landlock/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -9,10 +9,13 @@ TEST_GEN_PROGS := $(src_test:.c=) 
TEST_GEN_PROGS_EXTENDED := true



OVERRIDE_TARGETS := 1

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

include ../lib.mk



khdr_dir = $(top_srcdir)/usr/include



$(OUTPUT)/true: true.c

	$(LINK.c) $< $(LDLIBS) -o $@ -static



$(OUTPUT)/%_test: %_test.c ../kselftest_harness.h common.h

	$(LINK.c) $< $(LDLIBS) -o $@ -lcap
 
$(OUTPUT)/%_test: %_test.c $(khdr_dir)/linux/landlock.h ../kselftest_harness.h common.h

	$(LINK.c) $< $(LDLIBS) -o $@ -lcap -I$(khdr_dir)