Netdev List
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: daniel.baluta@gmail.com
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
	linux-wireless@vger.kernel.org
Subject: Re: [PATCH] net: Add socket() system call self test.
Date: Wed, 20 Mar 2013 15:10:55 -0400 (EDT)	[thread overview]
Message-ID: <20130320.151055.2179062291630664090.davem@davemloft.net> (raw)
In-Reply-To: <CAEnQRZDOwE592qXK0h-u1B7R-9oWP1CZ2rbt197QTn4oagdwgw@mail.gmail.com>

From: Daniel Baluta <daniel.baluta@gmail.com>
Date: Wed, 20 Mar 2013 00:14:05 +0200

> I think it's better to have a selftests/net directory dedicated for
> networking tests. Over time
> the number of net-{x} directories may become very large.

Good idea, here's what I've done for now:

====================
net: Move selftests to common net/ subdirectory.

Suggested-by: Daniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 tools/testing/selftests/Makefile                         |  3 +--
 tools/testing/selftests/net-socket/Makefile              | 16 ----------------
 tools/testing/selftests/{net-afpacket => net}/Makefile   |  9 +++++----
 .../selftests/{net-afpacket => net}/psock_fanout.c       |  0
 .../selftests/{net-afpacket => net}/run_afpackettests    |  0
 .../selftests/{net-socket => net}/run_netsocktests       |  0
 tools/testing/selftests/{net-socket => net}/socket.c     |  0
 7 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 tools/testing/selftests/net-socket/Makefile
 rename tools/testing/selftests/{net-afpacket => net}/Makefile (55%)
 rename tools/testing/selftests/{net-afpacket => net}/psock_fanout.c (100%)
 rename tools/testing/selftests/{net-afpacket => net}/run_afpackettests (100%)
 rename tools/testing/selftests/{net-socket => net}/run_netsocktests (100%)
 rename tools/testing/selftests/{net-socket => net}/socket.c (100%)

diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 7f50078..a480593 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 2450fd8..0000000
--- 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
similarity index 55%
rename from tools/testing/selftests/net-afpacket/Makefile
rename to tools/testing/selftests/net/Makefile
index 45f2ffb..bd6e272 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
similarity index 100%
rename from tools/testing/selftests/net-afpacket/psock_fanout.c
rename to tools/testing/selftests/net/psock_fanout.c
diff --git a/tools/testing/selftests/net-afpacket/run_afpackettests b/tools/testing/selftests/net/run_afpackettests
similarity index 100%
rename from tools/testing/selftests/net-afpacket/run_afpackettests
rename to tools/testing/selftests/net/run_afpackettests
diff --git a/tools/testing/selftests/net-socket/run_netsocktests b/tools/testing/selftests/net/run_netsocktests
similarity index 100%
rename from tools/testing/selftests/net-socket/run_netsocktests
rename to tools/testing/selftests/net/run_netsocktests
diff --git a/tools/testing/selftests/net-socket/socket.c b/tools/testing/selftests/net/socket.c
similarity index 100%
rename from tools/testing/selftests/net-socket/socket.c
rename to tools/testing/selftests/net/socket.c
-- 
1.7.11.7

  reply	other threads:[~2013-03-20 19:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19 18:52 [PATCH] net: Add socket() system call self test David Miller
2013-03-19 22:12 ` Julian Calaby
2013-03-19 22:19   ` David Miller
2013-03-19 22:22     ` Julian Calaby
2013-03-19 22:14 ` Daniel Baluta
2013-03-20 19:10   ` David Miller [this message]
     [not found]     ` <20130320.151055.2179062291630664090.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2013-03-20 19:29       ` Daniel Baluta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130320.151055.2179062291630664090.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=daniel.baluta@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox