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

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
...@@ -11,11 +11,11 @@ all: ...@@ -11,11 +11,11 @@ all:
BUILD_TARGET=$(OUTPUT)/$$DIR; \ BUILD_TARGET=$(OUTPUT)/$$DIR; \
mkdir $$BUILD_TARGET -p; \ mkdir $$BUILD_TARGET -p; \
make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ 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"; \ TEST=$$DIR"_test.sh"; \
if [ -e $$DIR/$$TEST ]; then if [ -e $$DIR/$$TEST ]; then \
rsync -a $$DIR/$$TEST $$BUILD_TARGET/; rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \
fi fi \
done done
override define RUN_TESTS override define RUN_TESTS
......
...@@ -12,9 +12,9 @@ all: ...@@ -12,9 +12,9 @@ all:
BUILD_TARGET=$(OUTPUT)/$$DIR; \ BUILD_TARGET=$(OUTPUT)/$$DIR; \
mkdir $$BUILD_TARGET -p; \ mkdir $$BUILD_TARGET -p; \
make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
if [ -e $$DIR/$(TEST_PROGS) ]; then if [ -e $$DIR/$(TEST_PROGS) ]; then \
rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \
fi fi \
done done
override define RUN_TESTS override define RUN_TESTS
......
...@@ -4,7 +4,7 @@ all: ...@@ -4,7 +4,7 @@ all:
include ../lib.mk include ../lib.mk
TEST_PROGS := mem-on-off-test.sh 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)" override EMIT_TESTS := echo "$(RUN_TESTS)"
run_full_test: run_full_test:
......
...@@ -2,3 +2,4 @@ CONFIG_MISC_FILESYSTEMS=y ...@@ -2,3 +2,4 @@ CONFIG_MISC_FILESYSTEMS=y
CONFIG_PSTORE=y CONFIG_PSTORE=y
CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_PMSG=y
CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=m
...@@ -30,7 +30,7 @@ $(TEST_CUSTOM_PROGS): $(TESTS) $(OBJS) ...@@ -30,7 +30,7 @@ $(TEST_CUSTOM_PROGS): $(TESTS) $(OBJS)
$(CC) -o $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS) $(CFLAGS) $(LDFLAGS) $(CC) -o $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS) $(CFLAGS) $(LDFLAGS)
$(OBJS): $(OUTPUT)/%.o: %.c $(OBJS): $(OUTPUT)/%.o: %.c
$(CC) -c $^ -o $@ $(CC) -c $^ -o $@ $(CFLAGS)
$(TESTS): $(OUTPUT)/%.o: %.c $(TESTS): $(OUTPUT)/%.o: %.c
$(CC) -c $^ -o $@ $(CC) -c $^ -o $@
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
include ../lib.mk
ifndef CROSS_COMPILE ifndef CROSS_COMPILE
CFLAGS := -std=gnu99 CFLAGS := -std=gnu99
CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector
...@@ -6,16 +8,14 @@ ifeq ($(CONFIG_X86_32),y) ...@@ -6,16 +8,14 @@ ifeq ($(CONFIG_X86_32),y)
LDLIBS += -lgcc_s LDLIBS += -lgcc_s
endif endif
TEST_PROGS := vdso_test vdso_standalone_test_x86 TEST_PROGS := $(OUTPUT)/vdso_test $(OUTPUT)/vdso_standalone_test_x86
all: $(TEST_PROGS) all: $(TEST_PROGS)
vdso_test: parse_vdso.c vdso_test.c $(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c
vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \ $(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
vdso_standalone_test_x86.c parse_vdso.c \ vdso_standalone_test_x86.c parse_vdso.c \
-o vdso_standalone_test_x86 -o $@
include ../lib.mk EXTRA_CLEAN := $(TEST_PROGS)
clean:
rm -fr $(TEST_PROGS)
endif endif
...@@ -11,3 +11,4 @@ mlock-intersect-test ...@@ -11,3 +11,4 @@ mlock-intersect-test
mlock-random-test mlock-random-test
virtual_address_range virtual_address_range
gup_benchmark gup_benchmark
va_128TBswitch
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment