Commit 3499de32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.16-rc4' of... 

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

Pull kselftest fixes from Shuah Khan:
 "Fixes for various problems in test output, compile errors, and missing
  configs"

* tag 'linux-kselftest-4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: vm: update .gitignore with new test
  selftests: memory-hotplug: silence test command echo
  selftests/futex: Fix line continuation in Makefile
  selftests: memfd: add config fragment for fuse
  selftests: pstore: Adding config fragment CONFIG_PSTORE_RAM=m
  selftests/android: Fix line continuation in Makefile
  selftest/vDSO: fix O=
  selftests: sync: missing CFLAGS while compiling
parents c02be233 f6869826

tools/testing/selftests/android/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ all: 
		BUILD_TARGET=$(OUTPUT)/$$DIR;	\

		mkdir $$BUILD_TARGET  -p;	\

		make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\

		#SUBDIR test prog name should be in the form: SUBDIR_test.sh

		#SUBDIR test prog name should be in the form: SUBDIR_test.sh \

		TEST=$$DIR"_test.sh"; \

		if [ -e $$DIR/$$TEST ]; then

			rsync -a $$DIR/$$TEST $$BUILD_TARGET/;

		fi

		if [ -e $$DIR/$$TEST ]; then \

			rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \

		fi \

	done



override define RUN_TESTS

tools/testing/selftests/futex/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ all: 
		BUILD_TARGET=$(OUTPUT)/$$DIR;	\

		mkdir $$BUILD_TARGET  -p;	\

		make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\

		if [ -e $$DIR/$(TEST_PROGS) ]; then

			rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/;

		fi

		if [ -e $$DIR/$(TEST_PROGS) ]; then \

			rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \

		fi \

	done



override define RUN_TESTS

tools/testing/selftests/memfd/config

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CONFIG_FUSE_FS=m

tools/testing/selftests/memory-hotplug/Makefile

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



TEST_PROGS := mem-on-off-test.sh

override RUN_TESTS := ./mem-on-off-test.sh -r 2 && echo "selftests: memory-hotplug [PASS]" || echo "selftests: memory-hotplug [FAIL]"

override RUN_TESTS := @./mem-on-off-test.sh -r 2 && echo "selftests: memory-hotplug [PASS]" || echo "selftests: memory-hotplug [FAIL]"

override EMIT_TESTS := echo "$(RUN_TESTS)"



run_full_test:

tools/testing/selftests/pstore/config

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ CONFIG_MISC_FILESYSTEMS=y 
CONFIG_PSTORE=y

CONFIG_PSTORE_PMSG=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE