Skip to content

Commit d6296cb

Browse files
committed
Merge tag 'linux-kselftest-next-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest update from Shuah Khan: - several patches to fix incorrect kernel headers search path from Mathieu Desnoyers - a few follow-on fixes found during testing the above change - miscellaneous fixes - support for filtering and enumerating tests * tag 'linux-kselftest-next-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (40 commits) selftests/user_events: add a note about user_events.h dependency selftests/mount_setattr: fix to make run_tests failure selftests/mount_setattr: fix redefine struct mount_attr build error selftests/sched: fix warn_unused_result build warns selftests/ptp: Remove clean target from Makefile selftests: use printf instead of echo -ne selftests/ftrace: Fix bash specific "==" operator selftests: tpm2: remove redundant ord() selftests: find echo binary to use -ne options selftests: Fix spelling mistake "allright" -> "all right" selftests: tdx: Use installed kernel headers search path selftests: ptrace: Use installed kernel headers search path selftests: memfd: Use installed kernel headers search path selftests: iommu: Use installed kernel headers search path selftests: x86: Fix incorrect kernel headers search path selftests: vm: Fix incorrect kernel headers search path selftests: user_events: Fix incorrect kernel headers search path selftests: sync: Fix incorrect kernel headers search path selftests: seccomp: Fix incorrect kernel headers search path selftests: sched: Fix incorrect kernel headers search path ...
2 parents f01d4c8 + 0eb15a4 commit d6296cb

File tree

43 files changed

+201
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+201
-67
lines changed

tools/testing/selftests/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ ifdef INSTALL_PATH
237237
@# included in the generated runlist.
238238
for TARGET in $(TARGETS); do \
239239
BUILD_TARGET=$$BUILD/$$TARGET; \
240-
[ ! -d $(INSTALL_PATH)/$$TARGET ] && echo "Skipping non-existent dir: $$TARGET" && continue; \
241-
echo -ne "Emit Tests for $$TARGET\n"; \
240+
[ ! -d $(INSTALL_PATH)/$$TARGET ] && printf "Skipping non-existent dir: $$TARGET\n" && continue; \
241+
printf "Emit Tests for $$TARGET\n"; \
242242
$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \
243243
-C $$TARGET emit_tests >> $(TEST_LIST); \
244244
done;

tools/testing/selftests/arm64/fp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# A proper top_srcdir is needed by KSFT(lib.mk)
44
top_srcdir = $(realpath ../../../../../)
55

6-
CFLAGS += -I$(top_srcdir)/usr/include/
6+
CFLAGS += $(KHDR_INCLUDES)
77

88
TEST_GEN_PROGS := fp-stress \
99
sve-ptrace sve-probe-vls \

tools/testing/selftests/arm64/tags/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
CFLAGS += -I../../../../../usr/include/
3+
CFLAGS += $(KHDR_INCLUDES)
44
TEST_GEN_PROGS := tags_test
55
TEST_PROGS := run_tags_test.sh
66

tools/testing/selftests/clone3/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
CFLAGS += -g -std=gnu99 -I../../../../usr/include/
2+
CFLAGS += -g -std=gnu99 $(KHDR_INCLUDES)
33
LDLIBS += -lcap
44

55
TEST_GEN_PROGS := clone3 clone3_clear_sighand clone3_set_tid \

tools/testing/selftests/core/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
CFLAGS += -g -I../../../../usr/include/
2+
CFLAGS += -g $(KHDR_INCLUDES)
33

44
TEST_GEN_PROGS := close_range_test
55

tools/testing/selftests/dmabuf-heaps/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
CFLAGS += -static -O3 -Wl,-no-as-needed -Wall
2+
CFLAGS += -static -O3 -Wl,-no-as-needed -Wall $(KHDR_INCLUDES)
33

44
TEST_GEN_PROGS = dmabuf-heap
55

tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
#include <sys/types.h>
1414

1515
#include <linux/dma-buf.h>
16+
#include <linux/dma-heap.h>
1617
#include <drm/drm.h>
1718

18-
#include "../../../../include/uapi/linux/dma-heap.h"
19-
2019
#define DEVPATH "/dev/dma_heap"
2120

2221
static int check_vgem(int fd)

tools/testing/selftests/drivers/dma-buf/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
CFLAGS += -I../../../../../usr/include/
2+
CFLAGS += $(KHDR_INCLUDES)
33

44
TEST_GEN_PROGS := udmabuf
55

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ else
1111
TEST_GEN_PROGS := test_uvdevice
1212

1313
top_srcdir ?= ../../../../../..
14-
khdr_dir = $(top_srcdir)/usr/include
1514
LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include
1615

17-
CFLAGS += -Wall -Werror -static -I$(khdr_dir) -I$(LINUX_TOOL_ARCH_INCLUDE)
16+
CFLAGS += -Wall -Werror -static $(KHDR_INCLUDES) -I$(LINUX_TOOL_ARCH_INCLUDE)
1817

1918
include ../../../lib.mk
2019

tools/testing/selftests/filesystems/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
CFLAGS += -I../../../../usr/include/
3+
CFLAGS += $(KHDR_INCLUDES)
44
TEST_GEN_PROGS := devpts_pts
55
TEST_GEN_PROGS_EXTENDED := dnotify_test
66

0 commit comments

Comments
 (0)