diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-20 15:07:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 15:07:56 -0400 |
| commit | a6f68034de8a5784dfeabb337506254c80b4c8c6 (patch) | |
| tree | edb2cce97a947d80676d34fb89c2a0a218bc77f3 | |
| parent | 4c1d8d0617a39c8325a7c2fd80ac14bf40fd8cc6 (diff) | |
net: Move selftests to common net/ subdirectory.
Suggested-by: Daniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | tools/testing/selftests/Makefile | 3 | ||||
| -rw-r--r-- | tools/testing/selftests/net-socket/Makefile | 16 | ||||
| -rw-r--r-- | tools/testing/selftests/net/Makefile (renamed from tools/testing/selftests/net-afpacket/Makefile) | 9 | ||||
| -rw-r--r-- | tools/testing/selftests/net/psock_fanout.c (renamed from tools/testing/selftests/net-afpacket/psock_fanout.c) | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/net/run_afpackettests (renamed from tools/testing/selftests/net-afpacket/run_afpackettests) | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/net/run_netsocktests (renamed from tools/testing/selftests/net-socket/run_netsocktests) | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/net/socket.c (renamed from tools/testing/selftests/net-socket/socket.c) | 0 |
7 files changed, 6 insertions, 22 deletions
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 7f50078d0e8..a4805932972 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -5,8 +5,7 @@ TARGETS += vm TARGETS += cpu-hotplug TARGETS += memory-hotplug TARGETS += efivarfs -TARGETS += net-socket -TARGETS += net-afpacket +TARGETS += net all: for TARGET in $(TARGETS); do \ diff --git a/tools/testing/selftests/net-socket/Makefile b/tools/testing/selftests/net-socket/Makefile deleted file mode 100644 index 2450fd8bb10..00000000000 --- a/tools/testing/selftests/net-socket/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Makefile for net-socket selftests - -CC = $(CROSS_COMPILE)gcc -CFLAGS = -Wall - -NET_SOCK_PROGS = socket - -all: $(NET_SOCK_PROGS) -%: %.c - $(CC) $(CFLAGS) -o $@ $^ - -run_tests: all - @/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]" - -clean: - $(RM) $(NET_SOCK_PROGS) diff --git a/tools/testing/selftests/net-afpacket/Makefile b/tools/testing/selftests/net/Makefile index 45f2ffb7fda..bd6e272bab8 100644 --- a/tools/testing/selftests/net-afpacket/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -1,18 +1,19 @@ -# Makefile for net-socket selftests +# Makefile for net selftests CC = $(CROSS_COMPILE)gcc CFLAGS = -Wall CFLAGS += -I../../../../usr/include/ -AF_PACKET_PROGS = psock_fanout +NET_PROGS = socket psock_fanout -all: $(AF_PACKET_PROGS) +all: $(NET_PROGS) %: %.c $(CC) $(CFLAGS) -o $@ $^ run_tests: all + @/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]" @/bin/sh ./run_afpackettests || echo "afpackettests: [FAIL]" clean: - $(RM) $(AF_PACKET_PROGS) + $(RM) $(NET_PROGS) diff --git a/tools/testing/selftests/net-afpacket/psock_fanout.c b/tools/testing/selftests/net/psock_fanout.c index 226e5e33105..226e5e33105 100644 --- a/tools/testing/selftests/net-afpacket/psock_fanout.c +++ b/tools/testing/selftests/net/psock_fanout.c diff --git a/tools/testing/selftests/net-afpacket/run_afpackettests b/tools/testing/selftests/net/run_afpackettests index 7907824c635..7907824c635 100644 --- a/tools/testing/selftests/net-afpacket/run_afpackettests +++ b/tools/testing/selftests/net/run_afpackettests diff --git a/tools/testing/selftests/net-socket/run_netsocktests b/tools/testing/selftests/net/run_netsocktests index c09a682df56..c09a682df56 100644 --- a/tools/testing/selftests/net-socket/run_netsocktests +++ b/tools/testing/selftests/net/run_netsocktests diff --git a/tools/testing/selftests/net-socket/socket.c b/tools/testing/selftests/net/socket.c index 0f227f2f9be..0f227f2f9be 100644 --- a/tools/testing/selftests/net-socket/socket.c +++ b/tools/testing/selftests/net/socket.c |