Skip to content

Commit

Permalink
selftests: Introduce minimal shared logic for running tests
Browse files Browse the repository at this point in the history
This adds a Make include file which most selftests can then include to
get the run_tests logic.

On its own this has the advantage of some reduction in repetition, and
also means the pass/fail message is defined in fewer places.

However the key advantage is it will allow us to implement install very
simply in a subsequent patch.

The default implementation just executes each program in $(TEST_PROGS).

We use a variable to hold the default implementation of $(RUN_TESTS)
because that gives us a clean way to override it if necessary, ie. using
override. The mount, memory-hotplug and mqueue tests use that to provide
a different implementation.

Tests are not run via /bin/bash, so if they are scripts they must be
executable, we add a+x to several.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
  • Loading branch information
Michael Ellerman authored and Shuah Khan committed Mar 13, 2015
1 parent 7fe5f1c commit 5e29a91
Show file tree
Hide file tree
Showing 29 changed files with 65 additions and 67 deletions.
5 changes: 3 additions & 2 deletions tools/testing/selftests/breakpoints/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ else
echo "Not an x86 target, can't build breakpoints selftests"
endif

run_tests:
@./breakpoint_test || echo "breakpoints selftests: [FAIL]"
TEST_PROGS := breakpoint_test

include ../lib.mk

clean:
rm -fr breakpoint_test
5 changes: 3 additions & 2 deletions tools/testing/selftests/cpu-hotplug/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
all:

run_tests:
@/bin/bash ./on-off-test.sh || echo "cpu-hotplug selftests: [FAIL]"
TEST_PROGS := on-off-test.sh

include ../lib.mk

run_full_test:
@/bin/bash ./on-off-test.sh -a || echo "cpu-hotplug selftests: [FAIL]"
Expand Down
Empty file modified tools/testing/selftests/cpu-hotplug/on-off-test.sh
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions tools/testing/selftests/efivarfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ test_objs = open-unlink create-read

all: $(test_objs)

run_tests: all
@/bin/bash ./efivarfs.sh || echo "efivarfs selftests: [FAIL]"
TEST_PROGS := efivarfs.sh

include ../lib.mk

clean:
rm -f $(test_objs)
Empty file modified tools/testing/selftests/efivarfs/efivarfs.sh
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions tools/testing/selftests/exec/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ execveat.denatured: execveat
%: %.c
$(CC) $(CFLAGS) -o $@ $^

run_tests: all
./execveat
TEST_PROGS := execveat

include ../lib.mk

clean:
rm -rf $(BINARIES) $(DEPS) subdir.moved execveat.moved xxxxx*
20 changes: 2 additions & 18 deletions tools/testing/selftests/firmware/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,9 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all:

fw_filesystem:
@if /bin/sh ./fw_filesystem.sh ; then \
echo "fw_filesystem: ok"; \
else \
echo "fw_filesystem: [FAIL]"; \
exit 1; \
fi
TEST_PROGS := fw_filesystem.sh fw_userhelper.sh

fw_userhelper:
@if /bin/sh ./fw_userhelper.sh ; then \
echo "fw_userhelper: ok"; \
else \
echo "fw_userhelper: [FAIL]"; \
exit 1; \
fi

run_tests: all fw_filesystem fw_userhelper
include ../lib.mk

# Nothing to clean up.
clean:

.PHONY: all clean run_tests fw_filesystem fw_userhelper
Empty file modified tools/testing/selftests/firmware/fw_filesystem.sh
100644 → 100755
Empty file.
Empty file modified tools/testing/selftests/firmware/fw_userhelper.sh
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions tools/testing/selftests/ftrace/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
all:

run_tests:
@/bin/sh ./ftracetest || echo "ftrace selftests: [FAIL]"
TEST_PROGS := ftracetest

include ../lib.mk

clean:
rm -rf logs/*
5 changes: 3 additions & 2 deletions tools/testing/selftests/ipc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ else
echo "Not an x86 target, can't build msgque selftest"
endif

run_tests: all
./msgque_test
TEST_PROGS := msgque_test

include ../lib.mk

clean:
rm -fr ./msgque_test
5 changes: 3 additions & 2 deletions tools/testing/selftests/kcmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ CFLAGS += -I../../../../usr/include/

all: kcmp_test

run_tests: all
@./kcmp_test || echo "kcmp_test: [FAIL]"
TEST_PROGS := kcmp_test

include ../lib.mk

clean:
$(RM) kcmp_test kcmp-test-file
10 changes: 10 additions & 0 deletions tools/testing/selftests/lib.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
define RUN_TESTS
@for TEST in $(TEST_PROGS); do \
(./$$TEST && echo "selftests: $$TEST [PASS]") || echo "selftests: $$TEST [FAIL]"; \
done;
endef

run_tests: all
$(RUN_TESTS)

.PHONY: run_tests all clean
6 changes: 3 additions & 3 deletions tools/testing/selftests/memfd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ CFLAGS += -I../../../../include/
all:
gcc $(CFLAGS) memfd_test.c -o memfd_test

run_tests: all
gcc $(CFLAGS) memfd_test.c -o memfd_test
@./memfd_test || echo "memfd_test: [FAIL]"
TEST_PROGS := memfd_test

include ../lib.mk

build_fuse:
gcc $(CFLAGS) fuse_mnt.c `pkg-config fuse --cflags --libs` -o fuse_mnt
Expand Down
5 changes: 3 additions & 2 deletions tools/testing/selftests/memory-hotplug/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
all:

run_tests:
@/bin/bash ./on-off-test.sh -r 2 || echo "memory-hotplug selftests: [FAIL]"
include ../lib.mk

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

run_full_test:
@/bin/bash ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
Expand Down
Empty file modified tools/testing/selftests/memory-hotplug/on-off-test.sh
100644 → 100755
Empty file.
8 changes: 2 additions & 6 deletions tools/testing/selftests/mount/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ all: unprivileged-remount-test
unprivileged-remount-test: unprivileged-remount-test.c
gcc -Wall -O2 unprivileged-remount-test.c -o unprivileged-remount-test

# Allow specific tests to be selected.
test_unprivileged_remount: unprivileged-remount-test
@if [ -f /proc/self/uid_map ] ; then ./unprivileged-remount-test ; fi
include ../lib.mk

run_tests: all test_unprivileged_remount
override RUN_TESTS := if [ -f /proc/self/uid_map ] ; then ./unprivileged-remount-test ; fi

clean:
rm -f unprivileged-remount-test

.PHONY: all test_unprivileged_remount
9 changes: 6 additions & 3 deletions tools/testing/selftests/mqueue/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ all:
gcc -O2 mq_open_tests.c -o mq_open_tests -lrt
gcc -O2 -o mq_perf_tests mq_perf_tests.c -lrt -lpthread -lpopt

run_tests:
@./mq_open_tests /test1 || echo "mq_open_tests: [FAIL]"
@./mq_perf_tests || echo "mq_perf_tests: [FAIL]"
include ../lib.mk

override define RUN_TESTS
@./mq_open_tests /test1 || echo "selftests: mq_open_tests [FAIL]"
@./mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"
endef

clean:
rm -f mq_open_tests mq_perf_tests
8 changes: 4 additions & 4 deletions tools/testing/selftests/net/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ all: $(NET_PROGS)
%: %.c
$(CC) $(CFLAGS) -o $@ $^

run_tests: all
@/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]"
@/bin/sh ./run_afpackettests || echo "afpackettests: [FAIL]"
./test_bpf.sh
TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh

include ../lib.mk

clean:
$(RM) $(NET_PROGS)
Empty file modified tools/testing/selftests/net/run_afpackettests
100644 → 100755
Empty file.
Empty file modified tools/testing/selftests/net/run_netsocktests
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions tools/testing/selftests/ptrace/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ all: peeksiginfo
clean:
rm -f peeksiginfo

run_tests: all
@./peeksiginfo || echo "peeksiginfo selftests: [FAIL]"
TEST_PROGS := peeksiginfo

include ../lib.mk
5 changes: 3 additions & 2 deletions tools/testing/selftests/size/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ all: get_size
get_size: get_size.c
$(CC) -static -ffreestanding -nostartfiles -s $< -o $@

run_tests: all
./get_size
TEST_PROGS := get_size

include ../lib.mk

clean:
$(RM) get_size
11 changes: 2 additions & 9 deletions tools/testing/selftests/sysctl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,9 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests".
all:

# Allow specific tests to be selected.
test_num:
@/bin/sh ./run_numerictests
TEST_PROGS := run_numerictests run_stringtests

test_string:
@/bin/sh ./run_stringtests

run_tests: all test_num test_string
include ../lib.mk

# Nothing to clean up.
clean:

.PHONY: all run_tests clean test_num test_string
Empty file modified tools/testing/selftests/sysctl/run_numerictests
100644 → 100755
Empty file.
Empty file modified tools/testing/selftests/sysctl/run_stringtests
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions tools/testing/selftests/user/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all:

run_tests: all
./test_user_copy.sh
TEST_PROGS := test_user_copy.sh

include ../lib.mk
5 changes: 3 additions & 2 deletions tools/testing/selftests/vm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ all: $(BINARIES)
%: %.c
$(CC) $(CFLAGS) -o $@ $^ -lrt

run_tests: all
@/bin/sh ./run_vmtests || (echo "vmtests: [FAIL]"; exit 1)
TEST_PROGS := run_vmtests

include ../lib.mk

clean:
$(RM) $(BINARIES)
Empty file modified tools/testing/selftests/vm/run_vmtests
100644 → 100755
Empty file.

0 comments on commit 5e29a91

Please sign in to comment.