Commit ca7e1fd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-5.6-rc3' of... 

Merge tag 'linux-kselftest-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fixes from Shuah Khan:
 "Fixes to build failures and other test bugs"

* tag 'linux-kselftest-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: openat2: fix build error on newer glibc
  selftests: use LDLIBS for libraries instead of LDFLAGS
  selftests: fix too long argument
  selftests: allow detection of build failures
  Kernel selftests: tpm2: check for tpm support
  selftests/ftrace: Have pid filter test use instance flag
  selftests: fix spelling mistaked "chaigned" -> "chained"
parents 4b205766 9a0584f0

tools/testing/selftests/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ ifneq ($(SKIP_TARGETS),) 
	override TARGETS := $(TMP)

endif



# User can set FORCE_TARGETS to 1 to require all targets to be successfully

# built; make will fail if any of the targets cannot be built. If

# FORCE_TARGETS is not set (the default), make will succeed if at least one

# of the targets gets built.

FORCE_TARGETS ?=



# Clear LDFLAGS and MAKEFLAGS if called from main

# Makefile to avoid test build failures when test

# Makefile doesn't have explicit build rules.
@@ -151,7 +157,8 @@ all: khdr 
	for TARGET in $(TARGETS); do				\

		BUILD_TARGET=$$BUILD/$$TARGET;			\

		mkdir $$BUILD_TARGET  -p;			\

		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;	\

		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET	\

				$(if $(FORCE_TARGETS),|| exit);	\

		ret=$$((ret * $$?));				\

	done; exit $$ret;
@@ -205,7 +212,8 @@ ifdef INSTALL_PATH 
	@ret=1;	\

	for TARGET in $(TARGETS); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \

		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install \

				$(if $(FORCE_TARGETS),|| exit);	\

		ret=$$((ret * $$?));		\

	done; exit $$ret;

tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc

+1 −7
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0

# description: ftrace - function pid filters

# flags: instance



# Make sure that function pid matching filter works.

# Also test it on an instance directory
@@ -96,13 +97,6 @@ do_test() { 
}



do_test



mkdir instances/foo

cd instances/foo

do_test

cd ../../

rmdir instances/foo



do_reset



exit 0

tools/testing/selftests/futex/functional/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

INCLUDES := -I../include -I../../

CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES)

LDFLAGS := $(LDFLAGS) -pthread -lrt

LDLIBS := -lpthread -lrt



HEADERS := \

	../include/futextest.h \

tools/testing/selftests/lib.mk

+13 −10
Original line number Diff line number Diff line
@@ -83,17 +83,20 @@ else 
	$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS))

endif



define INSTALL_SINGLE_RULE

	$(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH))

	$(if $(INSTALL_LIST),@echo rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/)

	$(if $(INSTALL_LIST),@rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/)

endef



define INSTALL_RULE

	@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then					\

		mkdir -p ${INSTALL_PATH};										\

		echo "rsync -a $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/";	\

		rsync -a $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/;		\

	fi

	@if [ "X$(TEST_GEN_PROGS)$(TEST_CUSTOM_PROGS)$(TEST_GEN_PROGS_EXTENDED)$(TEST_GEN_FILES)" != "X" ]; then					\

		mkdir -p ${INSTALL_PATH};										\

		echo "rsync -a $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/";	\

		rsync -a $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/;		\

	fi

	$(eval INSTALL_LIST = $(TEST_PROGS)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_FILES)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_GEN_PROGS)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_CUSTOM_PROGS)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_GEN_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_GEN_FILES)) $(INSTALL_SINGLE_RULE)

endef



install: all

tools/testing/selftests/net/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ KSFT_KHDR_INSTALL := 1 
include ../lib.mk



$(OUTPUT)/reuseport_bpf_numa: LDLIBS += -lnuma

$(OUTPUT)/tcp_mmap: LDFLAGS += -lpthread

$(OUTPUT)/tcp_inq: LDFLAGS += -lpthread
 
$(OUTPUT)/tcp_mmap: LDLIBS += -lpthread

$(OUTPUT)/tcp_inq: LDLIBS += -lpthread

CRA Git | Maintained and supported by SUSTech CRA and CCSE