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

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

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

Pull kselftest update from Shuah Khan:
 "This update adds two new test suites: futex and seccomp.

  In addition, it includes fixes for bugs in timers, other tests, and
  compile framework.  It introduces new quicktest feature to enable
  users to choose to run tests that complete in a short time"

* tag 'linux-kselftest-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: add quicktest support
  selftests: add seccomp suite
  selftest, x86: fix incorrect comment
  tools selftests: Fix 'clean' target with make 3.81
  selftests/futex: Add .gitignore
  kselftest: Add exit code defines
  selftests: Add futex tests to the top-level Makefile
  selftests/futex: Increment ksft pass and fail counters
  selftests/futex: Update Makefile to use lib.mk
  selftests: Add futex functional tests
  kselftests: timers: Check _ALARM clockids are supported before suspending
  kselftests: timers: Ease alarmtimer-suspend unreasonable latency value
  kselftests: timers: Increase delay between suspends in alarmtimer-suspend
  selftests/exec: do not install subdir as it is already created
  selftests/ftrace: install test.d
  selftests: copy TEST_DIRS to INSTALL_PATH
  Test compaction of mlocked memory
  selftests/mount: output WARN messages when mount test skipped
  selftests/timers: Make git ignore all binaries in timers test suite
parents c63f887b 2278e5ed

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8986,6 +8986,7 @@ S: Supported 
F:	kernel/seccomp.c

F:	include/uapi/linux/seccomp.h

F:	include/linux/seccomp.h

F:	tools/testing/selftests/seccomp/*

K:	\bsecure_computing

K:	\bTIF_SECCOMP\b

tools/testing/selftests/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ TARGETS += efivarfs 
TARGETS += exec

TARGETS += firmware

TARGETS += ftrace

TARGETS += futex

TARGETS += kcmp

TARGETS += memfd

TARGETS += memory-hotplug
@@ -12,13 +13,18 @@ TARGETS += mqueue 
TARGETS += net

TARGETS += powerpc

TARGETS += ptrace

TARGETS += seccomp

TARGETS += size

TARGETS += sysctl

ifneq (1, $(quicktest))

TARGETS += timers

endif

TARGETS += user

TARGETS += vm

TARGETS += x86

#Please keep the TARGETS list alphabetically sorted

# Run "make quicktest=1 run_tests" or

# "make quicktest=1 kselftest from top level Makefile



TARGETS_HOTPLUG = cpu-hotplug

TARGETS_HOTPLUG += memory-hotplug
@@ -27,7 +33,7 @@ TARGETS_HOTPLUG += memory-hotplug 
# Makefile to avoid test build failures when test

# Makefile doesn't have explicit build rules.

ifeq (1,$(MAKELEVEL))

undefine LDFLAGS

override LDFLAGS =

override MAKEFLAGS =

endif

tools/testing/selftests/exec/Makefile

+1 −1
Original line number Diff line number Diff line 
CFLAGS = -Wall

BINARIES = execveat

DEPS = execveat.symlink execveat.denatured script subdir

DEPS = execveat.symlink execveat.denatured script

all: $(BINARIES) $(DEPS)



subdir:

tools/testing/selftests/ftrace/Makefile

+1 −0
Original line number Diff line number Diff line 
all:



TEST_PROGS := ftracetest

TEST_DIRS := test.d/



include ../lib.mk

tools/testing/selftests/futex/Makefile

0 → 100644
+29 −0
Original line number Diff line number Diff line 
SUBDIRS := functional



TEST_PROGS := run.sh



.PHONY: all clean

all:

	for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done



include ../lib.mk



override define RUN_TESTS

	./run.sh

endef



override define INSTALL_RULE

	mkdir -p $(INSTALL_PATH)

	install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)



	@for SUBDIR in $(SUBDIRS); do \

		$(MAKE) -C $$SUBDIR INSTALL_PATH=$(INSTALL_PATH)/$$SUBDIR install; \

	done;

endef



override define EMIT_TESTS

	echo "./run.sh"

endef



clean:

	for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done

CRA Git | Maintained and supported by SUSTech CRA and CCSE