Commit 6a177af7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull kselftest updates from Shuah Khan:
 "This 12 patch update for 4.4-rc1 consists of a new pstore test and
  fixes to existing tests"

* tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: breakpoint: Actually build it
  selftests: vm: Try harder to allocate huge pages
  selftests: Make scripts executable
  selftests: kprobe: Choose an always-defined function to probe
  selftests: memfd: Stop unnecessary rebuilds
  selftests: Add missing #include directives
  selftests/seccomp: Be more precise with syscall arguments.
  selftests/seccomp: build and pass on arm64
  selftests: memfd_test: Revised STACK_SIZE to make it 16-byte aligned
  selftests/pstore: add pstore test scripts going with reboot
  selftests/pstore: add pstore test script for pre-reboot
  selftests: add .gitignore for efivarfs
parents ae36ce07 3b5bab39

tools/testing/selftests/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ TARGETS += mount 
TARGETS += mqueue

TARGETS += net

TARGETS += powerpc

TARGETS += pstore

TARGETS += ptrace

TARGETS += seccomp

TARGETS += size
@@ -66,6 +67,9 @@ clean_hotplug: 
		make -C $$TARGET clean; \

	done;



run_pstore_crash:

	make -C pstore run_crash



INSTALL_PATH ?= install

INSTALL_PATH := $(abspath $(INSTALL_PATH))

ALL_SCRIPT := $(INSTALL_PATH)/run_kselftest.sh

tools/testing/selftests/breakpoints/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ifeq ($(ARCH),x86) 
TEST_PROGS := breakpoint_test

endif



all:

all: $(TEST_PROGS)



include ../lib.mk

tools/testing/selftests/efivarfs/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
create-read

open-unlink

tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


echo 0 > events/enable

echo > kprobe_events

echo p:myevent do_fork > kprobe_events

echo p:myevent _do_fork > kprobe_events

grep myevent kprobe_events

test -d events/kprobes/myevent

echo > kprobe_events

tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


echo 0 > events/enable

echo > kprobe_events

echo p:myevent do_fork > kprobe_events

echo p:myevent _do_fork > kprobe_events

test -d events/kprobes/myevent

echo 1 > events/kprobes/myevent/enable

echo > kprobe_events && exit 1 # this must fail

CRA Git | Maintained and supported by SUSTech CRA and CCSE