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
This commit is contained in:
commit
3499de32fa
@ -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
|
||||
|
@ -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
|
||||
|
1
tools/testing/selftests/memfd/config
Normal file
1
tools/testing/selftests/memfd/config
Normal file
@ -0,0 +1 @@
|
||||
CONFIG_FUSE_FS=m
|
@ -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:
|
||||
|
@ -2,3 +2,4 @@ CONFIG_MISC_FILESYSTEMS=y
|
||||
CONFIG_PSTORE=y
|
||||
CONFIG_PSTORE_PMSG=y
|
||||
CONFIG_PSTORE_CONSOLE=y
|
||||
CONFIG_PSTORE_RAM=m
|
||||
|
@ -30,7 +30,7 @@ $(TEST_CUSTOM_PROGS): $(TESTS) $(OBJS)
|
||||
$(CC) -o $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS) $(CFLAGS) $(LDFLAGS)
|
||||
|
||||
$(OBJS): $(OUTPUT)/%.o: %.c
|
||||
$(CC) -c $^ -o $@
|
||||
$(CC) -c $^ -o $@ $(CFLAGS)
|
||||
|
||||
$(TESTS): $(OUTPUT)/%.o: %.c
|
||||
$(CC) -c $^ -o $@
|
||||
|
@ -1,4 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../lib.mk
|
||||
|
||||
ifndef CROSS_COMPILE
|
||||
CFLAGS := -std=gnu99
|
||||
CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector
|
||||
@ -6,16 +8,14 @@ ifeq ($(CONFIG_X86_32),y)
|
||||
LDLIBS += -lgcc_s
|
||||
endif
|
||||
|
||||
TEST_PROGS := vdso_test vdso_standalone_test_x86
|
||||
TEST_PROGS := $(OUTPUT)/vdso_test $(OUTPUT)/vdso_standalone_test_x86
|
||||
|
||||
all: $(TEST_PROGS)
|
||||
vdso_test: parse_vdso.c vdso_test.c
|
||||
vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
|
||||
$(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c
|
||||
$(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
|
||||
$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
|
||||
vdso_standalone_test_x86.c parse_vdso.c \
|
||||
-o vdso_standalone_test_x86
|
||||
-o $@
|
||||
|
||||
include ../lib.mk
|
||||
clean:
|
||||
rm -fr $(TEST_PROGS)
|
||||
EXTRA_CLEAN := $(TEST_PROGS)
|
||||
endif
|
||||
|
1
tools/testing/selftests/vm/.gitignore
vendored
1
tools/testing/selftests/vm/.gitignore
vendored
@ -11,3 +11,4 @@ mlock-intersect-test
|
||||
mlock-random-test
|
||||
virtual_address_range
|
||||
gup_benchmark
|
||||
va_128TBswitch
|
||||
|
Loading…
Reference in New Issue
Block a user