selftests: remove duplicated all and clean target

Currently, kselftest use TEST_PROGS, TEST_PROGS_EXTENDED, TEST_FILES to
indicate the test program, extended test program and test files. It is
easy to understand the purpose of these files. But mix of compiled and
uncompiled files lead to duplicated "all" and "clean" targets.

In order to remove the duplicated targets, introduce TEST_GEN_PROGS,
TEST_GEN_PROGS_EXTENDED, TEST_GEN_FILES to indicate the compiled
objects.

Also, the later patch will make use of TEST_GEN_XXX to redirect these
files to output directory indicated by KBUILD_OUTPUT or O.

And add this changes to "Contributing new tests(details)" of
Documentation/kselftest.txt.

Signed-off-by: Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
bamvor.zhangjian@huawei.com 2016-11-29 19:55:47 +08:00 committed by Shuah Khan
parent 7ce7d89f48
commit 88baa78d1f
37 changed files with 120 additions and 257 deletions

View File

@ -95,3 +95,15 @@ In general, the rules for selftests are
* Don't cause the top-level "make run_tests" to fail if your feature is * Don't cause the top-level "make run_tests" to fail if your feature is
unconfigured. unconfigured.
Contributing new tests(details)
===============================
* Use TEST_GEN_XXX if such binaries or files are generated during
compiling.
TEST_PROGS, TEST_GEN_PROGS mean it is the excutable tested by
default.
TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the
executable which is not tested by default.
TEST_FILES, TEST_GEN_FILES mean it is the file which is used by
test.

View File

@ -1,13 +1,7 @@
CFLAGS += -Wall -O2 -I../../../../usr/include CFLAGS += -Wall -O2 -I../../../../usr/include
test_objs = test_verifier test_maps test_lru_map TEST_GEN_PROGS = test_verifier test_maps test_lru_map
TEST_PROGS := test_verifier test_maps test_lru_map test_kmod.sh TEST_PROGS := test_kmod.sh
TEST_FILES := $(test_objs)
all: $(test_objs)
include ../lib.mk include ../lib.mk
clean:
$(RM) $(test_objs)

View File

@ -3,17 +3,13 @@ uname_M := $(shell uname -m 2>/dev/null || echo not)
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
TEST_PROGS := breakpoint_test TEST_GEN_PROGS := breakpoint_test
endif endif
ifeq ($(ARCH),aarch64) ifeq ($(ARCH),aarch64)
TEST_PROGS := breakpoint_test_arm64 TEST_GEN_PROGS := breakpoint_test_arm64
endif endif
TEST_PROGS += step_after_suspend_test TEST_GEN_PROGS += step_after_suspend_test
all: $(TEST_PROGS)
include ../lib.mk include ../lib.mk
clean:
rm -fr breakpoint_test breakpoint_test_arm64 step_after_suspend_test

View File

@ -1,15 +1,8 @@
TEST_FILES := validate_cap TEST_GEN_FILES := validate_cap
TEST_PROGS := test_execve TEST_GEN_PROGS := test_execve
BINARIES := $(TEST_FILES) $(TEST_PROGS)
CFLAGS += -O2 -g -std=gnu99 -Wall CFLAGS += -O2 -g -std=gnu99 -Wall
LDLIBS += -lcap-ng -lrt -ldl LDLIBS += -lcap-ng -lrt -ldl
all: $(BINARIES)
clean:
$(RM) $(BINARIES)
include ../lib.mk include ../lib.mk

View File

@ -1,13 +1,7 @@
CFLAGS = -Wall CFLAGS = -Wall
test_objs = open-unlink create-read TEST_GEN_FILES := open-unlink create-read
all: $(test_objs)
TEST_PROGS := efivarfs.sh TEST_PROGS := efivarfs.sh
TEST_FILES := $(test_objs)
include ../lib.mk include ../lib.mk
clean:
rm -f $(test_objs)

View File

@ -1,7 +1,4 @@
CFLAGS = -Wall CFLAGS = -Wall
BINARIES = execveat
DEPS = execveat.symlink execveat.denatured script subdir
all: $(BINARIES) $(DEPS)
subdir: subdir:
mkdir -p $@ mkdir -p $@
@ -17,11 +14,12 @@ execveat.denatured: execveat
%: %.c %: %.c
$(CC) $(CFLAGS) -o $@ $^ $(CC) $(CFLAGS) -o $@ $^
TEST_PROGS := execveat TEST_GEN_PROGS := execveat
TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir
# Makefile is a run-time dependency, since it's accessed by the execveat test # Makefile is a run-time dependency, since it's accessed by the execveat test
TEST_FILES := $(DEPS) Makefile TEST_FILES := Makefile
include ../lib.mk include ../lib.mk
clean: clean:
rm -rf $(BINARIES) $(DEPS) subdir.moved execveat.moved xxxxx* rm -rf $(TEST_GEN_PROGS) $(TEST_GEN_FILES) subdir.moved execveat.moved xxxxx*

View File

@ -3,7 +3,7 @@ CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES)
LDFLAGS := $(LDFLAGS) -pthread -lrt LDFLAGS := $(LDFLAGS) -pthread -lrt
HEADERS := ../include/futextest.h HEADERS := ../include/futextest.h
TARGETS := \ TEST_GEN_FILES := \
futex_wait_timeout \ futex_wait_timeout \
futex_wait_wouldblock \ futex_wait_wouldblock \
futex_requeue_pi \ futex_requeue_pi \
@ -12,14 +12,8 @@ TARGETS := \
futex_wait_uninitialized_heap \ futex_wait_uninitialized_heap \
futex_wait_private_mapped_file futex_wait_private_mapped_file
TEST_PROGS := $(TARGETS) run.sh TEST_PROGS := run.sh
.PHONY: all clean
all: $(TARGETS)
$(TARGETS): $(HEADERS)
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_FILES): $(HEADERS)
rm -f $(TARGETS)

View File

@ -11,12 +11,7 @@ endif
CFLAGS += -I../../../../usr/include/ CFLAGS += -I../../../../usr/include/
all: TEST_GEN_PROGS := msgque
$(CC) $(CFLAGS) msgque.c -o msgque_test
TEST_PROGS := msgque_test
include ../lib.mk include ../lib.mk
clean:
rm -fr ./msgque_test

View File

@ -1,10 +1,8 @@
CFLAGS += -I../../../../usr/include/ CFLAGS += -I../../../../usr/include/
all: kcmp_test TEST_GEN_PROGS := kcmp_test
TEST_PROGS := kcmp_test
include ../lib.mk include ../lib.mk
clean: clean:
$(RM) kcmp_test kcmp-test-file $(RM) $(TEST_GEN_PROGS) kcmp-test-file

View File

@ -3,7 +3,7 @@
CC := $(CROSS_COMPILE)gcc CC := $(CROSS_COMPILE)gcc
define RUN_TESTS define RUN_TESTS
@for TEST in $(TEST_PROGS); do \ @for TEST in $(TEST_GEN_PROGS) $(TEST_PROGS); do \
(./$$TEST && echo "selftests: $$TEST [PASS]") || echo "selftests: $$TEST [FAIL]"; \ (./$$TEST && echo "selftests: $$TEST [PASS]") || echo "selftests: $$TEST [FAIL]"; \
done; done;
endef endef
@ -17,6 +17,11 @@ define INSTALL_RULE
echo "rsync -a $(TEST_DIRS) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/"; \ echo "rsync -a $(TEST_DIRS) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/"; \
rsync -a $(TEST_DIRS) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/; \ rsync -a $(TEST_DIRS) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/; \
fi fi
@if [ "X$(TEST_GEN_PROGS)$(TEST_GEN_PROGS_EXTENDED)$(TEST_GEN_FILES)" != "X" ]; then \
mkdir -p ${INSTALL_PATH}; \
echo "rsync -a $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/"; \
rsync -a $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/; \
fi
endef endef
install: all install: all
@ -27,7 +32,7 @@ else
endif endif
define EMIT_TESTS define EMIT_TESTS
@for TEST in $(TEST_PROGS); do \ @for TEST in $(TEST_GEN_PROGS) $(TEST_PROGS); do \
echo "(./$$TEST && echo \"selftests: $$TEST [PASS]\") || echo \"selftests: $$TEST [FAIL]\""; \ echo "(./$$TEST && echo \"selftests: $$TEST [PASS]\") || echo \"selftests: $$TEST [FAIL]\""; \
done; done;
endef endef
@ -35,4 +40,9 @@ endef
emit_tests: emit_tests:
$(EMIT_TESTS) $(EMIT_TESTS)
all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
clean:
$(RM) -r $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
.PHONY: run_tests all clean install emit_tests .PHONY: run_tests all clean install emit_tests

View File

@ -1,10 +1,6 @@
CFLAGS += -g -I../../../../usr/include/ CFLAGS += -g -I../../../../usr/include/
TEST_PROGS := membarrier_test TEST_GEN_PROGS := membarrier_test
all: $(TEST_PROGS)
include ../lib.mk include ../lib.mk
clean:
$(RM) $(TEST_PROGS)

View File

@ -4,19 +4,11 @@ CFLAGS += -I../../../../include/uapi/
CFLAGS += -I../../../../include/ CFLAGS += -I../../../../include/
CFLAGS += -I../../../../usr/include/ CFLAGS += -I../../../../usr/include/
TEST_PROGS := memfd_test TEST_PROGS := run_fuse_test.sh
TEST_GEN_FILES := memfd_test fuse_mnt fuse_test
all: $(TEST_PROGS)
include ../lib.mk
build_fuse: fuse_mnt fuse_test
fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags) fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags)
fuse_mnt: LDFLAGS += $(shell pkg-config fuse --libs) fuse_mnt: LDFLAGS += $(shell pkg-config fuse --libs)
run_fuse: build_fuse include ../lib.mk
@./run_fuse_test.sh || echo "fuse_test: [FAIL]"
clean:
$(RM) memfd_test fuse_test

View File

@ -1,14 +1,14 @@
# Makefile for mount selftests. # Makefile for mount selftests.
CFLAGS = -Wall \ CFLAGS = -Wall \
-O2 -O2
all: unprivileged-remount-test
unprivileged-remount-test: unprivileged-remount-test.c unprivileged-remount-test: unprivileged-remount-test.c
$(CC) $(CFLAGS) unprivileged-remount-test.c -o unprivileged-remount-test $(CC) $(CFLAGS) unprivileged-remount-test.c -o unprivileged-remount-test
TEST_GEN_PROGS := unprivileged-remount-test
include ../lib.mk include ../lib.mk
TEST_PROGS := unprivileged-remount-test
override RUN_TESTS := if [ -f /proc/self/uid_map ] ; \ override RUN_TESTS := if [ -f /proc/self/uid_map ] ; \
then \ then \
./unprivileged-remount-test ; \ ./unprivileged-remount-test ; \
@ -17,5 +17,3 @@ override RUN_TESTS := if [ -f /proc/self/uid_map ] ; \
fi fi
override EMIT_TESTS := echo "$(RUN_TESTS)" override EMIT_TESTS := echo "$(RUN_TESTS)"
clean:
rm -f unprivileged-remount-test

View File

@ -1,8 +1,6 @@
CFLAGS += -O2 CFLAGS += -O2
LDLIBS = -lrt -lpthread -lpopt LDLIBS = -lrt -lpthread -lpopt
TEST_PROGS := mq_open_tests mq_perf_tests TEST_GEN_PROGS := mq_open_tests mq_perf_tests
all: $(TEST_PROGS)
include ../lib.mk include ../lib.mk
@ -16,5 +14,3 @@ override define EMIT_TESTS
echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\"" echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""
endef endef
clean:
rm -f mq_open_tests mq_perf_tests

View File

@ -3,20 +3,15 @@
CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS = -Wall -Wl,--no-as-needed -O2 -g
CFLAGS += -I../../../../usr/include/ CFLAGS += -I../../../../usr/include/
NET_PROGS = socket
NET_PROGS += psock_fanout psock_tpacket
NET_PROGS += reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
NET_PROGS += reuseport_dualstack
all: $(NET_PROGS)
reuseport_bpf_numa: LDFLAGS += -lnuma reuseport_bpf_numa: LDFLAGS += -lnuma
%: %.c %: %.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh
TEST_FILES := $(NET_PROGS) TEST_GEN_FILES = socket
TEST_GEN_FILES += psock_fanout psock_tpacket
TEST_GEN_FILES += reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
TEST_GEN_FILES += reuseport_dualstack
include ../lib.mk include ../lib.mk
clean:
$(RM) $(NET_PROGS)

View File

@ -1,12 +1,5 @@
TEST_PROGS := owner pidns TEST_GEN_PROGS := owner pidns
CFLAGS := -Wall -Werror CFLAGS := -Wall -Werror
all: owner pidns
owner: owner.c
pidns: pidns.c
clean:
$(RM) owner pidns
include ../lib.mk include ../lib.mk

View File

@ -1,10 +1,5 @@
TEST_PROGS := copy_unaligned copy_first_unaligned paste_unaligned paste_last_unaligned TEST_GEN_PROGS := copy_unaligned copy_first_unaligned paste_unaligned paste_last_unaligned
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c ../utils.c copy_paste_unaligned_common.c
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_PROGS): ../harness.c ../utils.c copy_paste_unaligned_common.c
rm -f $(TEST_PROGS)

View File

@ -1,16 +1,11 @@
TEST_PROGS := gettimeofday context_switch mmap_bench futex_bench null_syscall TEST_GEN_PROGS := gettimeofday context_switch mmap_bench futex_bench null_syscall
CFLAGS += -O2 CFLAGS += -O2
all: $(TEST_PROGS) $(TEST_GEN_PROGS): ../harness.c
$(TEST_PROGS): ../harness.c include ../../lib.mk
context_switch: ../utils.c context_switch: ../utils.c
context_switch: CFLAGS += -maltivec -mvsx -mabi=altivec context_switch: CFLAGS += -maltivec -mvsx -mabi=altivec
context_switch: LDLIBS += -lpthread context_switch: LDLIBS += -lpthread
include ../../lib.mk
clean:
rm -f $(TEST_PROGS) *.o

View File

@ -1,10 +1,5 @@
TEST_PROGS := cp_abort TEST_GEN_PROGS := cp_abort
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c ../utils.c
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_PROGS): ../harness.c ../utils.c
rm -f $(TEST_PROGS)

View File

@ -7,19 +7,14 @@ CFLAGS += -maltivec
# Use our CFLAGS for the implicit .S rule # Use our CFLAGS for the implicit .S rule
ASFLAGS = $(CFLAGS) ASFLAGS = $(CFLAGS)
TEST_PROGS := copyuser_64 copyuser_power7 memcpy_64 memcpy_power7 TEST_GEN_PROGS := copyuser_64 copyuser_power7 memcpy_64 memcpy_power7
EXTRA_SOURCES := validate.c ../harness.c EXTRA_SOURCES := validate.c ../harness.c
all: $(TEST_PROGS) include ../../lib.mk
copyuser_64: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_base copyuser_64: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_base
copyuser_power7: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_power7 copyuser_power7: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_power7
memcpy_64: CPPFLAGS += -D COPY_LOOP=test_memcpy memcpy_64: CPPFLAGS += -D COPY_LOOP=test_memcpy
memcpy_power7: CPPFLAGS += -D COPY_LOOP=test_memcpy_power7 memcpy_power7: CPPFLAGS += -D COPY_LOOP=test_memcpy_power7
$(TEST_PROGS): $(EXTRA_SOURCES) $(TEST_GEN_PROGS): $(EXTRA_SOURCES)
include ../../lib.mk
clean:
rm -f $(TEST_PROGS) *.o

View File

@ -1,14 +1,9 @@
TEST_PROGS := dscr_default_test dscr_explicit_test dscr_user_test \ TEST_GEN_PROGS := dscr_default_test dscr_explicit_test dscr_user_test \
dscr_inherit_test dscr_inherit_exec_test dscr_sysfs_test \ dscr_inherit_test dscr_inherit_exec_test dscr_sysfs_test \
dscr_sysfs_thread_test dscr_sysfs_thread_test
dscr_default_test: LDLIBS += -lpthread
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c
include ../../lib.mk include ../../lib.mk
clean: dscr_default_test: LDLIBS += -lpthread
rm -f $(TEST_PROGS) *.o
$(TEST_GEN_PROGS): ../harness.c

View File

@ -1,9 +1,9 @@
TEST_PROGS := fpu_syscall fpu_preempt fpu_signal vmx_syscall vmx_preempt vmx_signal vsx_preempt TEST_GEN_PROGS := fpu_syscall fpu_preempt fpu_signal vmx_syscall vmx_preempt vmx_signal vsx_preempt
all: $(TEST_PROGS) include ../../lib.mk
$(TEST_PROGS): ../harness.c $(TEST_GEN_PROGS): ../harness.c
$(TEST_PROGS): CFLAGS += -O2 -g -pthread -m64 -maltivec $(TEST_GEN_PROGS): CFLAGS += -O2 -g -pthread -m64 -maltivec
fpu_syscall: fpu_asm.S fpu_syscall: fpu_asm.S
fpu_preempt: fpu_asm.S fpu_preempt: fpu_asm.S
@ -15,8 +15,3 @@ vmx_signal: vmx_asm.S
vsx_preempt: CFLAGS += -mvsx vsx_preempt: CFLAGS += -mvsx
vsx_preempt: vsx_asm.S vsx_preempt: vsx_asm.S
include ../../lib.mk
clean:
rm -f $(TEST_PROGS) *.o

View File

@ -1,19 +1,15 @@
noarg: noarg:
$(MAKE) -C ../ $(MAKE) -C ../
TEST_PROGS := hugetlb_vs_thp_test subpage_prot prot_sao TEST_GEN_PROGS := hugetlb_vs_thp_test subpage_prot prot_sao
TEST_FILES := tempfile TEST_GEN_FILES := tempfile
all: $(TEST_PROGS) $(TEST_FILES)
$(TEST_PROGS): ../harness.c
prot_sao: ../utils.c
include ../../lib.mk include ../../lib.mk
$(TEST_GEN_PROGS): ../harness.c
prot_sao: ../utils.c
tempfile: tempfile:
dd if=/dev/zero of=tempfile bs=64k count=1 dd if=/dev/zero of=tempfile bs=64k count=1
clean:
rm -f $(TEST_PROGS) tempfile

View File

@ -1,12 +1,14 @@
noarg: noarg:
$(MAKE) -C ../ $(MAKE) -C ../
TEST_PROGS := count_instructions l3_bank_test per_event_excludes TEST_GEN_PROGS := count_instructions l3_bank_test per_event_excludes
EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c
all: $(TEST_PROGS) ebb include ../../lib.mk
$(TEST_PROGS): $(EXTRA_SOURCES) all: $(TEST_GEN_PROGS) ebb
$(TEST_GEN_PROGS): $(EXTRA_SOURCES)
# loop.S can only be built 64-bit # loop.S can only be built 64-bit
count_instructions: loop.S count_instructions.c $(EXTRA_SOURCES) count_instructions: loop.S count_instructions.c $(EXTRA_SOURCES)
@ -14,8 +16,6 @@ count_instructions: loop.S count_instructions.c $(EXTRA_SOURCES)
per_event_excludes: ../utils.c per_event_excludes: ../utils.c
include ../../lib.mk
DEFAULT_RUN_TESTS := $(RUN_TESTS) DEFAULT_RUN_TESTS := $(RUN_TESTS)
override define RUN_TESTS override define RUN_TESTS
$(DEFAULT_RUN_TESTS) $(DEFAULT_RUN_TESTS)
@ -35,7 +35,7 @@ override define INSTALL_RULE
endef endef
clean: clean:
rm -f $(TEST_PROGS) loop.o $(RM) $(TEST_PROGS) loop.o
$(MAKE) -C ebb clean $(MAKE) -C ebb clean
ebb: ebb:

View File

@ -4,7 +4,7 @@ noarg:
# The EBB handler is 64-bit code and everything links against it # The EBB handler is 64-bit code and everything links against it
CFLAGS += -m64 CFLAGS += -m64
TEST_PROGS := reg_access_test event_attributes_test cycles_test \ TEST_GEN_PROGS := reg_access_test event_attributes_test cycles_test \
cycles_with_freeze_test pmc56_overflow_test \ cycles_with_freeze_test pmc56_overflow_test \
ebb_vs_cpu_event_test cpu_event_vs_ebb_test \ ebb_vs_cpu_event_test cpu_event_vs_ebb_test \
cpu_event_pinned_vs_ebb_test task_event_vs_ebb_test \ cpu_event_pinned_vs_ebb_test task_event_vs_ebb_test \
@ -16,16 +16,11 @@ TEST_PROGS := reg_access_test event_attributes_test cycles_test \
lost_exception_test no_handler_test \ lost_exception_test no_handler_test \
cycles_with_mmcr2_test cycles_with_mmcr2_test
all: $(TEST_PROGS) include ../../../lib.mk
$(TEST_PROGS): ../../harness.c ../../utils.c ../event.c ../lib.c \ $(TEST_GEN_PROGS): ../../harness.c ../../utils.c ../event.c ../lib.c \
ebb.c ebb_handler.S trace.c busy_loop.S ebb.c ebb_handler.S trace.c busy_loop.S
instruction_count_test: ../loop.S instruction_count_test: ../loop.S
lost_exception_test: ../lib.c lost_exception_test: ../lib.c
include ../../../lib.mk
clean:
rm -f $(TEST_PROGS)

View File

@ -1,12 +1,7 @@
CFLAGS += -I$(CURDIR) CFLAGS += -I$(CURDIR)
TEST_PROGS := load_unaligned_zeropad TEST_GEN_PROGS := load_unaligned_zeropad
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_PROGS): ../harness.c
rm -f $(TEST_PROGS) *.o

View File

@ -2,14 +2,9 @@
CFLAGS += -m64 CFLAGS += -m64
CFLAGS += -I$(CURDIR) CFLAGS += -I$(CURDIR)
TEST_PROGS := memcmp TEST_GEN_PROGS := memcmp
EXTRA_SOURCES := memcmp_64.S ../harness.c EXTRA_SOURCES := memcmp_64.S ../harness.c
all: $(TEST_PROGS)
$(TEST_PROGS): $(EXTRA_SOURCES)
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_PROGS): $(EXTRA_SOURCES)
rm -f $(TEST_PROGS) *.o

View File

@ -1,8 +1,8 @@
TEST_PROGS := switch_endian_test TEST_GEN_PROGS := switch_endian_test
ASFLAGS += -O2 -Wall -g -nostdlib -m64 ASFLAGS += -O2 -Wall -g -nostdlib -m64
all: $(TEST_PROGS) include ../../lib.mk
switch_endian_test: check-reversed.S switch_endian_test: check-reversed.S
@ -12,7 +12,5 @@ check-reversed.o: check.o
check-reversed.S: check-reversed.o check-reversed.S: check-reversed.o
hexdump -v -e '/1 ".byte 0x%02X\n"' $< > $@ hexdump -v -e '/1 ".byte 0x%02X\n"' $< > $@
include ../../lib.mk
clean: clean:
rm -f $(TEST_PROGS) *.o check-reversed.S $(RM) $(TEST_GEN_PROGS) *.o check-reversed.S

View File

@ -1,12 +1,7 @@
TEST_PROGS := ipc_unmuxed TEST_GEN_PROGS := ipc_unmuxed
CFLAGS += -I../../../../../usr/include CFLAGS += -I../../../../../usr/include
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_PROGS): ../harness.c
rm -f $(TEST_PROGS) *.o

View File

@ -1,12 +1,12 @@
SIGNAL_CONTEXT_CHK_TESTS := tm-signal-context-chk-gpr tm-signal-context-chk-fpu \ SIGNAL_CONTEXT_CHK_TESTS := tm-signal-context-chk-gpr tm-signal-context-chk-fpu \
tm-signal-context-chk-vmx tm-signal-context-chk-vsx tm-signal-context-chk-vmx tm-signal-context-chk-vsx
TEST_PROGS := tm-resched-dscr tm-syscall tm-signal-msr-resv tm-signal-stack \ TEST_GEN_PROGS := tm-resched-dscr tm-syscall tm-signal-msr-resv tm-signal-stack \
tm-vmxcopy tm-fork tm-tar tm-tmspr $(SIGNAL_CONTEXT_CHK_TESTS) tm-vmxcopy tm-fork tm-tar tm-tmspr $(SIGNAL_CONTEXT_CHK_TESTS)
all: $(TEST_PROGS) include ../../lib.mk
$(TEST_PROGS): ../harness.c ../utils.c $(TEST_GEN_PROGS): ../harness.c ../utils.c
CFLAGS += -mhtm CFLAGS += -mhtm
@ -16,8 +16,3 @@ tm-tmspr: CFLAGS += -pthread
$(SIGNAL_CONTEXT_CHK_TESTS): tm-signal.S $(SIGNAL_CONTEXT_CHK_TESTS): tm-signal.S
$(SIGNAL_CONTEXT_CHK_TESTS): CFLAGS += -mhtm -m64 -mvsx $(SIGNAL_CONTEXT_CHK_TESTS): CFLAGS += -mhtm -m64 -mvsx
include ../../lib.mk
clean:
rm -f $(TEST_PROGS) *.o

View File

@ -1,12 +1,8 @@
TEST_PROGS := test-vphn TEST_GEN_PROGS := test-vphn
CFLAGS += -m64 CFLAGS += -m64
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c
include ../../lib.mk include ../../lib.mk
clean: $(TEST_GEN_PROGS): ../harness.c
rm -f $(TEST_PROGS)

View File

@ -1,11 +1,5 @@
CFLAGS += -iquote../../../../include/uapi -Wall CFLAGS += -iquote../../../../include/uapi -Wall
peeksiginfo: peeksiginfo.c
all: peeksiginfo TEST_GEN_PROGS := peeksiginfo
clean:
rm -f peeksiginfo
TEST_PROGS := peeksiginfo
include ../lib.mk include ../lib.mk

View File

@ -1,10 +1,6 @@
TEST_PROGS := seccomp_bpf TEST_GEN_PROGS := seccomp_bpf
CFLAGS += -Wl,-no-as-needed -Wall CFLAGS += -Wl,-no-as-needed -Wall
LDFLAGS += -lpthread LDFLAGS += -lpthread
all: $(TEST_PROGS)
include ../lib.mk include ../lib.mk
clean:
$(RM) $(TEST_PROGS)

View File

@ -1,8 +1,5 @@
CFLAGS = -Wall CFLAGS = -Wall
BINARIES = sas TEST_GEN_PROGS = sas
all: $(BINARIES)
include ../lib.mk include ../lib.mk
clean:
rm -rf $(BINARIES)

View File

@ -1,11 +1,7 @@
all: get_size
get_size: get_size.c get_size: get_size.c
$(CC) -static -ffreestanding -nostartfiles -s $< -o $@ $(CC) -static -ffreestanding -nostartfiles -s $< -o $@
TEST_PROGS := get_size TEST_GEN_PROGS := get_size
include ../lib.mk include ../lib.mk
clean:
$(RM) get_size

View File

@ -5,16 +5,13 @@ LDFLAGS += -lrt -lpthread
# these are all "safe" tests that don't modify # these are all "safe" tests that don't modify
# system time or require escalated privledges # system time or require escalated privledges
TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \
inconsistency-check raw_skew threadtest rtctest inconsistency-check raw_skew threadtest rtctest
TEST_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew \ TEST_GEN_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew \
skew_consistency clocksource-switch leap-a-day \ skew_consistency clocksource-switch leap-a-day \
leapcrash set-tai set-2038 set-tz leapcrash set-tai set-2038 set-tz
bins = $(TEST_PROGS) $(TEST_PROGS_EXTENDED)
all: ${bins}
include ../lib.mk include ../lib.mk
@ -34,5 +31,3 @@ run_destructive_tests: run_tests
./set-tai ./set-tai
./set-2038 ./set-2038
clean:
rm -f ${bins}

View File

@ -1,18 +1,17 @@
# Makefile for vm selftests # Makefile for vm selftests
CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS)
BINARIES = compaction_test TEST_GEN_FILES = compaction_test
BINARIES += hugepage-mmap TEST_GEN_FILES += hugepage-mmap
BINARIES += hugepage-shm TEST_GEN_FILES += hugepage-shm
BINARIES += map_hugetlb TEST_GEN_FILES += map_hugetlb
BINARIES += mlock2-tests TEST_GEN_FILES += mlock2-tests
BINARIES += on-fault-limit TEST_GEN_FILES += on-fault-limit
BINARIES += thuge-gen TEST_GEN_FILES += thuge-gen
BINARIES += transhuge-stress TEST_GEN_FILES += transhuge-stress
BINARIES += userfaultfd TEST_GEN_FILES += userfaultfd
BINARIES += mlock-random-test TEST_GEN_FILES += mlock-random-test
all: $(BINARIES)
%: %.c %: %.c
$(CC) $(CFLAGS) -o $@ $^ -lrt $(CC) $(CFLAGS) -o $@ $^ -lrt
userfaultfd: userfaultfd.c ../../../../usr/include/linux/kernel.h userfaultfd: userfaultfd.c ../../../../usr/include/linux/kernel.h
@ -25,9 +24,6 @@ mlock-random-test: mlock-random-test.c
make -C ../../../.. headers_install make -C ../../../.. headers_install
TEST_PROGS := run_vmtests TEST_PROGS := run_vmtests
TEST_FILES := $(BINARIES)
include ../lib.mk include ../lib.mk
clean:
$(RM) $(BINARIES)