From cef1abf3059a0a5132410816ad9042f02b044e11 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 20 Mar 2013 15:07:56 -0400
Subject: [PATCH] --- yaml --- r: 368341 b: refs/heads/master c:
 a6f68034de8a5784dfeabb337506254c80b4c8c6 h: refs/heads/master i:   368339:
 b79b7eb52a0307d0b0c1b90fc6c8b25962166030 v: v3

---
 [refs]                                           |  2 +-
 trunk/tools/testing/selftests/Makefile           |  3 +--
 .../tools/testing/selftests/net-socket/Makefile  | 16 ----------------
 .../selftests/{net-afpacket => net}/Makefile     |  9 +++++----
 .../{net-afpacket => net}/psock_fanout.c         |  0
 .../{net-afpacket => net}/run_afpackettests      |  0
 .../{net-socket => net}/run_netsocktests         |  0
 .../selftests/{net-socket => net}/socket.c       |  0
 8 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 trunk/tools/testing/selftests/net-socket/Makefile
 rename trunk/tools/testing/selftests/{net-afpacket => net}/Makefile (55%)
 rename trunk/tools/testing/selftests/{net-afpacket => net}/psock_fanout.c (100%)
 rename trunk/tools/testing/selftests/{net-afpacket => net}/run_afpackettests (100%)
 rename trunk/tools/testing/selftests/{net-socket => net}/run_netsocktests (100%)
 rename trunk/tools/testing/selftests/{net-socket => net}/socket.c (100%)

diff --git a/[refs] b/[refs]
index b94684d17015..72b3abf1a4a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c1d8d0617a39c8325a7c2fd80ac14bf40fd8cc6
+refs/heads/master: a6f68034de8a5784dfeabb337506254c80b4c8c6
diff --git a/trunk/tools/testing/selftests/Makefile b/trunk/tools/testing/selftests/Makefile
index 7f50078d0e8c..a4805932972b 100644
--- a/trunk/tools/testing/selftests/Makefile
+++ b/trunk/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/trunk/tools/testing/selftests/net-socket/Makefile b/trunk/tools/testing/selftests/net-socket/Makefile
deleted file mode 100644
index 2450fd8bb10a..000000000000
--- a/trunk/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/trunk/tools/testing/selftests/net-afpacket/Makefile b/trunk/tools/testing/selftests/net/Makefile
similarity index 55%
rename from trunk/tools/testing/selftests/net-afpacket/Makefile
rename to trunk/tools/testing/selftests/net/Makefile
index 45f2ffb7fda7..bd6e272bab87 100644
--- a/trunk/tools/testing/selftests/net-afpacket/Makefile
+++ b/trunk/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/trunk/tools/testing/selftests/net-afpacket/psock_fanout.c b/trunk/tools/testing/selftests/net/psock_fanout.c
similarity index 100%
rename from trunk/tools/testing/selftests/net-afpacket/psock_fanout.c
rename to trunk/tools/testing/selftests/net/psock_fanout.c
diff --git a/trunk/tools/testing/selftests/net-afpacket/run_afpackettests b/trunk/tools/testing/selftests/net/run_afpackettests
similarity index 100%
rename from trunk/tools/testing/selftests/net-afpacket/run_afpackettests
rename to trunk/tools/testing/selftests/net/run_afpackettests
diff --git a/trunk/tools/testing/selftests/net-socket/run_netsocktests b/trunk/tools/testing/selftests/net/run_netsocktests
similarity index 100%
rename from trunk/tools/testing/selftests/net-socket/run_netsocktests
rename to trunk/tools/testing/selftests/net/run_netsocktests
diff --git a/trunk/tools/testing/selftests/net-socket/socket.c b/trunk/tools/testing/selftests/net/socket.c
similarity index 100%
rename from trunk/tools/testing/selftests/net-socket/socket.c
rename to trunk/tools/testing/selftests/net/socket.c