Commit 797a3242 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-5.4-rc1.1' of... 

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

Pull Kselftest updates from Shuah Khan:
 "Fixes to existing tests"

* tag 'linux-kselftest-5.4-rc1.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: tpm2: install python files
  selftests: livepatch: add missing fragments to config
  selftests: watchdog: cleanup whitespace in usage options
  selftest/ftrace: Fix typo in trigger-snapshot.tc
  selftests: watchdog: Add optional file argument
  selftests/seccomp: fix build on older kernels
  selftests: use "$(MAKE)" instead of "make"
parents 972a2bf7 721cb3c8

tools/testing/selftests/Makefile

+11 −11
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ endif 
# in the default INSTALL_HDR_PATH usr/include.

khdr:

ifeq (1,$(DEFAULT_INSTALL_HDR_PATH))

	make --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install

	$(MAKE) --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install

else

	make --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \

	$(MAKE) --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \

		ARCH=$(ARCH) -C $(top_srcdir) headers_install

endif
@@ -136,35 +136,35 @@ 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;\

	done;



run_tests: all

	@for TARGET in $(TARGETS); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\

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

	done;



hotplug:

	@for TARGET in $(TARGETS_HOTPLUG); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET;\

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

	done;



run_hotplug: hotplug

	@for TARGET in $(TARGETS_HOTPLUG); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\

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

	done;



clean_hotplug:

	@for TARGET in $(TARGETS_HOTPLUG); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\

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

	done;



run_pstore_crash:

	make -C pstore run_crash

	$(MAKE) -C pstore run_crash



# Use $BUILD as the default install root. $BUILD points to the

# right output location for the following cases:
@@ -184,7 +184,7 @@ ifdef INSTALL_PATH 
	install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/

	@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; \

	done;



	@# Ask all targets to emit their test scripts
@@ -203,7 +203,7 @@ ifdef INSTALL_PATH 
		echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \

		echo "cd $$TARGET" >> $(ALL_SCRIPT); \

		echo -n "run_many" >> $(ALL_SCRIPT); \

		make -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \

		$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \

		echo "" >> $(ALL_SCRIPT);	    \

		echo "cd \$$ROOT" >> $(ALL_SCRIPT); \

	done;
@@ -216,7 +216,7 @@ endif 
clean:

	@for TARGET in $(TARGETS); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\

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

	done;



.PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean

tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ if [ -z "$FEATURE" ]; then 
    exit_unsupported

fi



echo "Test snapshot tigger"

echo "Test snapshot trigger"

echo 0 > snapshot

echo 1 > events/sched/sched_process_fork/enable

( echo "forked")

tools/testing/selftests/livepatch/config

+2 −0
Original line number Diff line number Diff line 
CONFIG_LIVEPATCH=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_TEST_LIVEPATCH=m

tools/testing/selftests/seccomp/seccomp_bpf.c

+5 −0
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ struct seccomp_notif_sizes { 
};

#endif



#ifndef PTRACE_EVENTMSG_SYSCALL_ENTRY

#define PTRACE_EVENTMSG_SYSCALL_ENTRY	1

#define PTRACE_EVENTMSG_SYSCALL_EXIT	2

#endif



#ifndef seccomp

int seccomp(unsigned int op, unsigned int flags, void *args)

{

tools/testing/selftests/tpm2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
include ../lib.mk



TEST_PROGS := test_smoke.sh test_space.sh

TEST_FILES := tpm2.py tpm2_tests.py
 
TEST_PROGS_EXTENDED := tpm2.py tpm2_tests.py

CRA Git | Maintained and supported by SUSTech CRA and CCSE