Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2868b251 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull kselftest updates from Shuah Khan:
 "This update consists of:

   - important fixes for build failures and clean target related
     warnings to address regressions introduced in commit 88baa78d
     ("selftests: remove duplicated all and clean target")

   - several minor spelling fixes in and log messages and comment
     blocks.

   - Enabling configs for better test coverage in ftrace, vm, and
     cpufreq tests.

   - .gitignore changes"

* tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (26 commits)
  selftests: x86: add missing executables to .gitignore
  selftests: watchdog: accept multiple params on command line
  selftests: create cpufreq kconfig fragments
  selftests: x86: override clean in lib.mk to fix warnings
  selftests: sync: override clean in lib.mk to fix warnings
  selftests: splice: override clean in lib.mk to fix warnings
  selftests: gpio: fix clean target to remove all generated files and dirs
  selftests: add gpio generated files to .gitignore
  selftests: powerpc: override clean in lib.mk to fix warnings
  selftests: gpio: override clean in lib.mk to fix warnings
  selftests: futex: override clean in lib.mk to fix warnings
  selftests: lib.mk: define CLEAN macro to allow Makefiles to override clean
  selftests: splice: fix clean target to not remove default_file_splice_read.sh
  selftests: gpio: add config fragment for gpio-mockup
  selftests: breakpoints: allow to cross-compile for aarch64/arm64
  selftests/Makefile: Add missed PHONY targets
  selftests/vm/run_vmtests: Fix wrong comment
  selftests/Makefile: Add missed closing `"` in comment
  selftests/vm/run_vmtests: Polish output text
  selftests/timers: fix spelling mistake: "Asynchronous"
  ...
parents 00d95933 945f8f5f

tools/testing/selftests/.gitignore

+4 −0
Original line number Diff line number Diff line 
kselftest

gpiogpio-event-mon

gpiogpio-hammer

gpioinclude/

gpiolsgpio

tools/testing/selftests/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ TARGETS += x86 
TARGETS += zram

#Please keep the TARGETS list alphabetically sorted

# Run "make quicktest=1 run_tests" or

# "make quicktest=1 kselftest from top level Makefile

# "make quicktest=1 kselftest" from top level Makefile



TARGETS_HOTPLUG = cpu-hotplug

TARGETS_HOTPLUG += memory-hotplug
@@ -133,4 +133,4 @@ clean: 
		make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\

	done;



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

tools/testing/selftests/breakpoints/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) 
ifeq ($(ARCH),x86)

TEST_GEN_PROGS := breakpoint_test

endif

ifeq ($(ARCH),aarch64)

ifneq (,$(filter $(ARCH),aarch64 arm64))

TEST_GEN_PROGS := breakpoint_test_arm64

endif

tools/testing/selftests/cpufreq/config

0 → 100644
+15 −0
Original line number Diff line number Diff line 
CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_PI_LIST=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_LOCK_ALLOC=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCKDEP=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

tools/testing/selftests/ftrace/config

+1 −0
Original line number Diff line number Diff line 
CONFIG_KPROBES=y

CONFIG_FTRACE=y