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

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

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

Pull Kselftest update from Shuah Khan:
 "This Kselftest update consists of several fixes to framework and
  individual tests.

  In addition, it enables LKDTM tests adding lkdtm target to kselftest
  Makefile"

* tag 'linux-kselftest-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/ftrace: fix glob selftest
  selftests: settings: tests can be in subsubdirs
  kselftest: Minimise dependency of get_size on C library interfaces
  selftests/livepatch: Remove unused local variable in set_ftrace_enabled()
  selftests/livepatch: Replace set_dynamic_debug() with setup_config() in README
  selftests/lkdtm: Add tests for LKDTM targets
  selftests: Uninitialized variable in test_cgcore_proc_migration()
  selftests: fix build behaviour on targets' failures
parents 22b17db4 af4ddd60

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9656,6 +9656,7 @@ LINUX KERNEL DUMP TEST MODULE (LKDTM) 
M:	Kees Cook <keescook@chromium.org>

S:	Maintained

F:	drivers/misc/lkdtm/*

F:	tools/testing/selftests/lkdtm/*















LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)















M:	Alan Stern <stern@rowland.harvard.edu>

































tools/testing/selftests/Makefile



+12
−7






























Original line number
Diff line number
Diff line








@@ -26,6 +26,7 @@ TARGETS += kexec













TARGETS += kvm















TARGETS += lib















TARGETS += livepatch













TARGETS += lkdtm















TARGETS += membarrier















TARGETS += memfd















TARGETS += memory-hotplug










@@ -146,11 +147,13 @@ else













endif































all: khdr













	@for TARGET in $(TARGETS); do		\













	@ret=1;							\













	for TARGET in $(TARGETS); do				\















		BUILD_TARGET=$$BUILD/$$TARGET;			\















		mkdir $$BUILD_TARGET  -p;			\















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













	done;













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













	done; exit $$ret;































run_tests: all















	@for TARGET in $(TARGETS); do \










@@ -199,10 +202,12 @@ ifdef INSTALL_PATH













	install -m 744 kselftest/module.sh $(INSTALL_PATH)/kselftest/















	install -m 744 kselftest/runner.sh $(INSTALL_PATH)/kselftest/















	install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/













	@for TARGET in $(TARGETS); do \













	@ret=1;	\













	for TARGET in $(TARGETS); do \















		BUILD_TARGET=$$BUILD/$$TARGET;	\















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













	done;













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













	done; exit $$ret;































	@# Ask all targets to emit their test scripts















	echo "#!/bin/sh" > $(ALL_SCRIPT)

































tools/testing/selftests/cgroup/test_core.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -369,7 +369,7 @@ static void *dummy_thread_fn(void *arg)













static int test_cgcore_proc_migration(const char *root)















{















	int ret = KSFT_FAIL;













	int t, c_threads, n_threads = 13;













	int t, c_threads = 0, n_threads = 13;















	char *src = NULL, *dst = NULL;















	pthread_t threads[n_threads];

















































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



+1
−1






























Original line number
Diff line number
Diff line








@@ -30,7 +30,7 @@ ftrace_filter_check '*schedule*' '^.*schedule.*$'













ftrace_filter_check 'schedule*' '^schedule.*$'































# filter by *mid*end













ftrace_filter_check '*aw*lock' '.*aw.*lock$'













ftrace_filter_check '*pin*lock' '.*pin.*lock$'































# filter by start*mid*















ftrace_filter_check 'mutex*try*' '^mutex.*try.*'

































tools/testing/selftests/kselftest/runner.sh



+1
−1






























Original line number
Diff line number
Diff line








@@ -91,7 +91,7 @@ run_one()













run_many()















{















	echo "TAP version 13"













	DIR=$(basename "$PWD")













	DIR="${PWD#${BASE_DIR}/}"















	test_num=0















	total=$(echo "$@" | wc -w)















	echo "1..$total"









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE