From 5e54f6d4f9dd607ae2afcea4fe72f2f1763e4b5e Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 21 Dec 2018 12:26:38 -0500
Subject: [PATCH] tests/kits/net: Move libnetwork-related tests to
 tests/system/network.

---
 src/tests/kits/net/Jamfile                    | 27 ----------------
 src/tests/system/Jamfile                      |  1 +
 src/tests/system/network/Jamfile              | 31 +++++++++++++++++++
 .../{kits/net => system/network}/at_client.c  |  0
 .../{kits/net => system/network}/at_srv.c     |  0
 .../net => system/network}/firefox_crash.cpp  |  0
 .../net => system/network}/getpeername.cpp    |  0
 .../{kits/net => system/network}/icmp/Jamfile |  2 +-
 .../network}/icmp/big_datagram.cpp            |  0
 .../network}/icmp/icmp_dumper.cpp             |  0
 .../network}/icmp/tcp_unreachable.cpp         |  0
 .../network}/icmp/udp_unreachable.cpp         |  0
 .../net => system/network}/if_nameindex.c     |  0
 .../net => system/network}/ipv46_client.cpp   |  0
 .../net => system/network}/ipv46_server.cpp   |  0
 .../{kits/net => system/network}/ipv6/Jamfile |  2 +-
 .../network}/ipv6/multicast_sender.cpp        |  0
 .../network}/ipv6/raw_client.cpp              |  0
 .../network}/ipv6/raw_server.cpp              |  0
 .../network}/ipv6/tcp_udp_client.cpp          |  0
 .../network}/ipv6/tcp_udp_server.cpp          |  0
 .../network}/ipv6/udp_client.cpp              |  0
 .../network}/ipv6/udp_server.cpp              |  0
 .../net => system/network}/multicast/Jamfile  |  2 +-
 .../network}/multicast/multicast.cpp          |  0
 .../network}/multicast/multicat.c             |  0
 .../network}/multicast/multisend.c            |  0
 .../network}/posixnet/GetAddrInfo.cpp         |  0
 .../network}/posixnet/GetAddrInfo.h           |  0
 .../net => system/network}/posixnet/Jamfile   |  2 +-
 .../network}/posixnet/PosixNetTestAddon.cpp   |  0
 .../net => system/network}/select_test.c      |  0
 .../net => system/network}/select_test2.c     |  0
 .../net => system/network}/select_test_big.c  |  0
 .../{kits/net => system/network}/sock/Jamfile |  2 +-
 .../net => system/network}/sock/addrinfo.h    |  0
 .../net => system/network}/sock/buffers.c     |  0
 .../net => system/network}/sock/cliopen.c     |  0
 .../net => system/network}/sock/config.h      |  0
 .../{kits/net => system/network}/sock/crlf.c  |  0
 .../{kits/net => system/network}/sock/error.c |  0
 .../net => system/network}/sock/global.h      |  0
 .../net => system/network}/sock/looptcp.c     |  0
 .../net => system/network}/sock/loopudp.c     |  0
 .../{kits/net => system/network}/sock/main.c  |  0
 .../net => system/network}/sock/multicast.c   |  0
 .../net => system/network}/sock/ourhdr.h      |  0
 .../net => system/network}/sock/pattern.c     |  0
 .../net => system/network}/sock/servopen.c    |  0
 .../net => system/network}/sock/sinktcp.c     |  0
 .../net => system/network}/sock/sinkudp.c     |  0
 .../net => system/network}/sock/sleepus.c     |  0
 .../{kits/net => system/network}/sock/sock.h  |  0
 .../net => system/network}/sock/sockopts.c    |  0
 .../net => system/network}/sock/sourceroute.c |  0
 .../net => system/network}/sock/sourcetcp.c   |  0
 .../net => system/network}/sock/sourceudp.c   |  0
 .../net => system/network}/sock/tellwait.c    |  0
 .../{kits/net => system/network}/sock/write.c |  0
 .../net => system/network}/sock/writen.c      |  0
 .../{kits/net => system/network}/stop_stack.c |  0
 .../{kits/net => system/network}/tcp_client.c |  0
 .../network}/tcp_connection_test.cpp          |  0
 .../{kits/net => system/network}/tcp_server.c |  0
 .../network}/tcp_shell/BufferQueueTest.cpp    |  0
 .../net => system/network}/tcp_shell/Jamfile  | 10 +++---
 .../network}/tcp_shell/tcp_shell.cpp          |  0
 .../net => system/network}/tcptester/Jamfile  |  2 +-
 .../network}/tcptester/tcptester.cpp          |  0
 .../{kits/net => system/network}/test1.c      |  0
 .../{kits/net => system/network}/test2.c      |  0
 .../{kits/net => system/network}/test3.c      |  0
 .../{kits/net => system/network}/udp_client.c |  0
 .../net => system/network}/udp_connect.cpp    |  0
 .../{kits/net => system/network}/udp_echo.c   |  0
 .../{kits/net => system/network}/udp_server.c |  0
 .../{kits/net => system/network}/ufunc.c      |  0
 .../{kits/net => system/network}/ufunc.h      |  0
 78 files changed, 43 insertions(+), 38 deletions(-)
 create mode 100644 src/tests/system/network/Jamfile
 rename src/tests/{kits/net => system/network}/at_client.c (100%)
 rename src/tests/{kits/net => system/network}/at_srv.c (100%)
 rename src/tests/{kits/net => system/network}/firefox_crash.cpp (100%)
 rename src/tests/{kits/net => system/network}/getpeername.cpp (100%)
 rename src/tests/{kits/net => system/network}/icmp/Jamfile (84%)
 rename src/tests/{kits/net => system/network}/icmp/big_datagram.cpp (100%)
 rename src/tests/{kits/net => system/network}/icmp/icmp_dumper.cpp (100%)
 rename src/tests/{kits/net => system/network}/icmp/tcp_unreachable.cpp (100%)
 rename src/tests/{kits/net => system/network}/icmp/udp_unreachable.cpp (100%)
 rename src/tests/{kits/net => system/network}/if_nameindex.c (100%)
 rename src/tests/{kits/net => system/network}/ipv46_client.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv46_server.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/Jamfile (91%)
 rename src/tests/{kits/net => system/network}/ipv6/multicast_sender.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/raw_client.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/raw_server.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/tcp_udp_client.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/tcp_udp_server.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/udp_client.cpp (100%)
 rename src/tests/{kits/net => system/network}/ipv6/udp_server.cpp (100%)
 rename src/tests/{kits/net => system/network}/multicast/Jamfile (75%)
 rename src/tests/{kits/net => system/network}/multicast/multicast.cpp (100%)
 rename src/tests/{kits/net => system/network}/multicast/multicat.c (100%)
 rename src/tests/{kits/net => system/network}/multicast/multisend.c (100%)
 rename src/tests/{kits/net => system/network}/posixnet/GetAddrInfo.cpp (100%)
 rename src/tests/{kits/net => system/network}/posixnet/GetAddrInfo.h (100%)
 rename src/tests/{kits/net => system/network}/posixnet/Jamfile (75%)
 rename src/tests/{kits/net => system/network}/posixnet/PosixNetTestAddon.cpp (100%)
 rename src/tests/{kits/net => system/network}/select_test.c (100%)
 rename src/tests/{kits/net => system/network}/select_test2.c (100%)
 rename src/tests/{kits/net => system/network}/select_test_big.c (100%)
 rename src/tests/{kits/net => system/network}/sock/Jamfile (85%)
 rename src/tests/{kits/net => system/network}/sock/addrinfo.h (100%)
 rename src/tests/{kits/net => system/network}/sock/buffers.c (100%)
 rename src/tests/{kits/net => system/network}/sock/cliopen.c (100%)
 rename src/tests/{kits/net => system/network}/sock/config.h (100%)
 rename src/tests/{kits/net => system/network}/sock/crlf.c (100%)
 rename src/tests/{kits/net => system/network}/sock/error.c (100%)
 rename src/tests/{kits/net => system/network}/sock/global.h (100%)
 rename src/tests/{kits/net => system/network}/sock/looptcp.c (100%)
 rename src/tests/{kits/net => system/network}/sock/loopudp.c (100%)
 rename src/tests/{kits/net => system/network}/sock/main.c (100%)
 rename src/tests/{kits/net => system/network}/sock/multicast.c (100%)
 rename src/tests/{kits/net => system/network}/sock/ourhdr.h (100%)
 rename src/tests/{kits/net => system/network}/sock/pattern.c (100%)
 rename src/tests/{kits/net => system/network}/sock/servopen.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sinktcp.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sinkudp.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sleepus.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sock.h (100%)
 rename src/tests/{kits/net => system/network}/sock/sockopts.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sourceroute.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sourcetcp.c (100%)
 rename src/tests/{kits/net => system/network}/sock/sourceudp.c (100%)
 rename src/tests/{kits/net => system/network}/sock/tellwait.c (100%)
 rename src/tests/{kits/net => system/network}/sock/write.c (100%)
 rename src/tests/{kits/net => system/network}/sock/writen.c (100%)
 rename src/tests/{kits/net => system/network}/stop_stack.c (100%)
 rename src/tests/{kits/net => system/network}/tcp_client.c (100%)
 rename src/tests/{kits/net => system/network}/tcp_connection_test.cpp (100%)
 rename src/tests/{kits/net => system/network}/tcp_server.c (100%)
 rename src/tests/{kits/net => system/network}/tcp_shell/BufferQueueTest.cpp (100%)
 rename src/tests/{kits/net => system/network}/tcp_shell/Jamfile (88%)
 rename src/tests/{kits/net => system/network}/tcp_shell/tcp_shell.cpp (100%)
 rename src/tests/{kits/net => system/network}/tcptester/Jamfile (59%)
 rename src/tests/{kits/net => system/network}/tcptester/tcptester.cpp (100%)
 rename src/tests/{kits/net => system/network}/test1.c (100%)
 rename src/tests/{kits/net => system/network}/test2.c (100%)
 rename src/tests/{kits/net => system/network}/test3.c (100%)
 rename src/tests/{kits/net => system/network}/udp_client.c (100%)
 rename src/tests/{kits/net => system/network}/udp_connect.cpp (100%)
 rename src/tests/{kits/net => system/network}/udp_echo.c (100%)
 rename src/tests/{kits/net => system/network}/udp_server.c (100%)
 rename src/tests/{kits/net => system/network}/ufunc.c (100%)
 rename src/tests/{kits/net => system/network}/ufunc.h (100%)

diff --git a/src/tests/kits/net/Jamfile b/src/tests/kits/net/Jamfile
index 2b0978bc6e..bfc196b5ea 100644
--- a/src/tests/kits/net/Jamfile
+++ b/src/tests/kits/net/Jamfile
@@ -2,28 +2,8 @@ SubDir HAIKU_TOP src tests kits net ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SimpleTest firefox_crash : firefox_crash.cpp : $(TARGET_NETWORK_LIBS) ;
-
-SimpleTest udp_client : udp_client.c : $(TARGET_NETWORK_LIBS) ;
-SimpleTest udp_connect : udp_connect.cpp : $(TARGET_NETWORK_LIBS) ;
-SimpleTest udp_echo : udp_echo.c : $(TARGET_NETWORK_LIBS) ;
-SimpleTest udp_server : udp_server.c : $(TARGET_NETWORK_LIBS) ;
-
-SimpleTest tcp_server : tcp_server.c : $(TARGET_NETWORK_LIBS) ;
-SimpleTest tcp_client : tcp_client.c : $(TARGET_NETWORK_LIBS) ;
-
-SimpleTest ipv46_server : ipv46_server.cpp : $(TARGET_NETWORK_LIBS) ;
-SimpleTest ipv46_client : ipv46_client.cpp : $(TARGET_NETWORK_LIBS) ;
-
 SimpleTest link_echo : link_echo.cpp : $(TARGET_NETWORK_LIBS) bnetapi be ;
 
-SimpleTest getpeername : getpeername.cpp : $(TARGET_NETWORK_LIBS) ;
-
-SimpleTest if_nameindex : if_nameindex.c : $(TARGET_NETWORK_LIBS) ;
-
-SimpleTest tcp_connection_test : tcp_connection_test.cpp
-	: $(TARGET_NETWORK_LIBS) ;
-
 SimpleTest NetAddressTest : NetAddressTest.cpp
 	: $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) ;
 
@@ -33,13 +13,6 @@ SimpleTest NetEndpointTest : NetEndpointTest.cpp
 SimpleTest wlan_test : wlan_test.cpp : $(TARGET_NETWORK_LIBS) bnetapi be ;
 
 SubInclude HAIKU_TOP src tests kits net cookie ;
-SubInclude HAIKU_TOP src tests kits net icmp ;
-SubInclude HAIKU_TOP src tests kits net ipv6 ;
 HaikuSubInclude libnetapi ;
-SubInclude HAIKU_TOP src tests kits net multicast ;
-SubInclude HAIKU_TOP src tests kits net posixnet ;
 SubInclude HAIKU_TOP src tests kits net service ;
-SubInclude HAIKU_TOP src tests kits net sock ;
-SubInclude HAIKU_TOP src tests kits net tcp_shell ;
-SubInclude HAIKU_TOP src tests kits net tcptester ;
 SubInclude HAIKU_TOP src tests kits net urlRequest ;
diff --git a/src/tests/system/Jamfile b/src/tests/system/Jamfile
index 3277dcae11..eaf4453fbe 100644
--- a/src/tests/system/Jamfile
+++ b/src/tests/system/Jamfile
@@ -5,3 +5,4 @@ SubInclude HAIKU_TOP src tests system boot ;
 SubInclude HAIKU_TOP src tests system glue ;
 SubInclude HAIKU_TOP src tests system kernel ;
 SubInclude HAIKU_TOP src tests system libroot ;
+SubInclude HAIKU_TOP src tests system network ;
diff --git a/src/tests/system/network/Jamfile b/src/tests/system/network/Jamfile
new file mode 100644
index 0000000000..48d2c2791d
--- /dev/null
+++ b/src/tests/system/network/Jamfile
@@ -0,0 +1,31 @@
+SubDir HAIKU_TOP src tests system network ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+SimpleTest firefox_crash : firefox_crash.cpp : $(TARGET_NETWORK_LIBS) ;
+
+SimpleTest udp_client : udp_client.c : $(TARGET_NETWORK_LIBS) ;
+SimpleTest udp_connect : udp_connect.cpp : $(TARGET_NETWORK_LIBS) ;
+SimpleTest udp_echo : udp_echo.c : $(TARGET_NETWORK_LIBS) ;
+SimpleTest udp_server : udp_server.c : $(TARGET_NETWORK_LIBS) ;
+
+SimpleTest tcp_server : tcp_server.c : $(TARGET_NETWORK_LIBS) ;
+SimpleTest tcp_client : tcp_client.c : $(TARGET_NETWORK_LIBS) ;
+
+SimpleTest ipv46_server : ipv46_server.cpp : $(TARGET_NETWORK_LIBS) ;
+SimpleTest ipv46_client : ipv46_client.cpp : $(TARGET_NETWORK_LIBS) ;
+
+SimpleTest getpeername : getpeername.cpp : $(TARGET_NETWORK_LIBS) ;
+
+SimpleTest if_nameindex : if_nameindex.c : $(TARGET_NETWORK_LIBS) ;
+
+SimpleTest tcp_connection_test : tcp_connection_test.cpp
+	: $(TARGET_NETWORK_LIBS) ;
+
+SubInclude HAIKU_TOP src tests system network icmp ;
+SubInclude HAIKU_TOP src tests system network ipv6 ;
+SubInclude HAIKU_TOP src tests system network multicast ;
+SubInclude HAIKU_TOP src tests system network posixnet ;
+SubInclude HAIKU_TOP src tests system network sock ;
+SubInclude HAIKU_TOP src tests system network tcp_shell ;
+SubInclude HAIKU_TOP src tests system network tcptester ;
diff --git a/src/tests/kits/net/at_client.c b/src/tests/system/network/at_client.c
similarity index 100%
rename from src/tests/kits/net/at_client.c
rename to src/tests/system/network/at_client.c
diff --git a/src/tests/kits/net/at_srv.c b/src/tests/system/network/at_srv.c
similarity index 100%
rename from src/tests/kits/net/at_srv.c
rename to src/tests/system/network/at_srv.c
diff --git a/src/tests/kits/net/firefox_crash.cpp b/src/tests/system/network/firefox_crash.cpp
similarity index 100%
rename from src/tests/kits/net/firefox_crash.cpp
rename to src/tests/system/network/firefox_crash.cpp
diff --git a/src/tests/kits/net/getpeername.cpp b/src/tests/system/network/getpeername.cpp
similarity index 100%
rename from src/tests/kits/net/getpeername.cpp
rename to src/tests/system/network/getpeername.cpp
diff --git a/src/tests/kits/net/icmp/Jamfile b/src/tests/system/network/icmp/Jamfile
similarity index 84%
rename from src/tests/kits/net/icmp/Jamfile
rename to src/tests/system/network/icmp/Jamfile
index 34ac958208..d2e988b3b5 100644
--- a/src/tests/kits/net/icmp/Jamfile
+++ b/src/tests/system/network/icmp/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net icmp ;
+SubDir HAIKU_TOP src tests system network icmp ;
 
 SimpleTest big_datagram :
 	big_datagram.cpp
diff --git a/src/tests/kits/net/icmp/big_datagram.cpp b/src/tests/system/network/icmp/big_datagram.cpp
similarity index 100%
rename from src/tests/kits/net/icmp/big_datagram.cpp
rename to src/tests/system/network/icmp/big_datagram.cpp
diff --git a/src/tests/kits/net/icmp/icmp_dumper.cpp b/src/tests/system/network/icmp/icmp_dumper.cpp
similarity index 100%
rename from src/tests/kits/net/icmp/icmp_dumper.cpp
rename to src/tests/system/network/icmp/icmp_dumper.cpp
diff --git a/src/tests/kits/net/icmp/tcp_unreachable.cpp b/src/tests/system/network/icmp/tcp_unreachable.cpp
similarity index 100%
rename from src/tests/kits/net/icmp/tcp_unreachable.cpp
rename to src/tests/system/network/icmp/tcp_unreachable.cpp
diff --git a/src/tests/kits/net/icmp/udp_unreachable.cpp b/src/tests/system/network/icmp/udp_unreachable.cpp
similarity index 100%
rename from src/tests/kits/net/icmp/udp_unreachable.cpp
rename to src/tests/system/network/icmp/udp_unreachable.cpp
diff --git a/src/tests/kits/net/if_nameindex.c b/src/tests/system/network/if_nameindex.c
similarity index 100%
rename from src/tests/kits/net/if_nameindex.c
rename to src/tests/system/network/if_nameindex.c
diff --git a/src/tests/kits/net/ipv46_client.cpp b/src/tests/system/network/ipv46_client.cpp
similarity index 100%
rename from src/tests/kits/net/ipv46_client.cpp
rename to src/tests/system/network/ipv46_client.cpp
diff --git a/src/tests/kits/net/ipv46_server.cpp b/src/tests/system/network/ipv46_server.cpp
similarity index 100%
rename from src/tests/kits/net/ipv46_server.cpp
rename to src/tests/system/network/ipv46_server.cpp
diff --git a/src/tests/kits/net/ipv6/Jamfile b/src/tests/system/network/ipv6/Jamfile
similarity index 91%
rename from src/tests/kits/net/ipv6/Jamfile
rename to src/tests/system/network/ipv6/Jamfile
index 3cc6dc4848..6dd7f5e886 100644
--- a/src/tests/kits/net/ipv6/Jamfile
+++ b/src/tests/system/network/ipv6/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net ipv6 ;
+SubDir HAIKU_TOP src tests system network ipv6 ;
 
 SimpleTest ipv6_raw_server : raw_server.cpp : $(TARGET_NETWORK_LIBS) ;
 SimpleTest ipv6_raw_client : raw_client.cpp : $(TARGET_NETWORK_LIBS) ;
diff --git a/src/tests/kits/net/ipv6/multicast_sender.cpp b/src/tests/system/network/ipv6/multicast_sender.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/multicast_sender.cpp
rename to src/tests/system/network/ipv6/multicast_sender.cpp
diff --git a/src/tests/kits/net/ipv6/raw_client.cpp b/src/tests/system/network/ipv6/raw_client.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/raw_client.cpp
rename to src/tests/system/network/ipv6/raw_client.cpp
diff --git a/src/tests/kits/net/ipv6/raw_server.cpp b/src/tests/system/network/ipv6/raw_server.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/raw_server.cpp
rename to src/tests/system/network/ipv6/raw_server.cpp
diff --git a/src/tests/kits/net/ipv6/tcp_udp_client.cpp b/src/tests/system/network/ipv6/tcp_udp_client.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/tcp_udp_client.cpp
rename to src/tests/system/network/ipv6/tcp_udp_client.cpp
diff --git a/src/tests/kits/net/ipv6/tcp_udp_server.cpp b/src/tests/system/network/ipv6/tcp_udp_server.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/tcp_udp_server.cpp
rename to src/tests/system/network/ipv6/tcp_udp_server.cpp
diff --git a/src/tests/kits/net/ipv6/udp_client.cpp b/src/tests/system/network/ipv6/udp_client.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/udp_client.cpp
rename to src/tests/system/network/ipv6/udp_client.cpp
diff --git a/src/tests/kits/net/ipv6/udp_server.cpp b/src/tests/system/network/ipv6/udp_server.cpp
similarity index 100%
rename from src/tests/kits/net/ipv6/udp_server.cpp
rename to src/tests/system/network/ipv6/udp_server.cpp
diff --git a/src/tests/kits/net/multicast/Jamfile b/src/tests/system/network/multicast/Jamfile
similarity index 75%
rename from src/tests/kits/net/multicast/Jamfile
rename to src/tests/system/network/multicast/Jamfile
index 63be5b3347..8c6c1d77ec 100644
--- a/src/tests/kits/net/multicast/Jamfile
+++ b/src/tests/system/network/multicast/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net multicast ;
+SubDir HAIKU_TOP src tests system network multicast ;
 
 BinCommand multicast :
 	multicast.cpp
diff --git a/src/tests/kits/net/multicast/multicast.cpp b/src/tests/system/network/multicast/multicast.cpp
similarity index 100%
rename from src/tests/kits/net/multicast/multicast.cpp
rename to src/tests/system/network/multicast/multicast.cpp
diff --git a/src/tests/kits/net/multicast/multicat.c b/src/tests/system/network/multicast/multicat.c
similarity index 100%
rename from src/tests/kits/net/multicast/multicat.c
rename to src/tests/system/network/multicast/multicat.c
diff --git a/src/tests/kits/net/multicast/multisend.c b/src/tests/system/network/multicast/multisend.c
similarity index 100%
rename from src/tests/kits/net/multicast/multisend.c
rename to src/tests/system/network/multicast/multisend.c
diff --git a/src/tests/kits/net/posixnet/GetAddrInfo.cpp b/src/tests/system/network/posixnet/GetAddrInfo.cpp
similarity index 100%
rename from src/tests/kits/net/posixnet/GetAddrInfo.cpp
rename to src/tests/system/network/posixnet/GetAddrInfo.cpp
diff --git a/src/tests/kits/net/posixnet/GetAddrInfo.h b/src/tests/system/network/posixnet/GetAddrInfo.h
similarity index 100%
rename from src/tests/kits/net/posixnet/GetAddrInfo.h
rename to src/tests/system/network/posixnet/GetAddrInfo.h
diff --git a/src/tests/kits/net/posixnet/Jamfile b/src/tests/system/network/posixnet/Jamfile
similarity index 75%
rename from src/tests/kits/net/posixnet/Jamfile
rename to src/tests/system/network/posixnet/Jamfile
index 5c0ab067fc..673cc11a0d 100644
--- a/src/tests/kits/net/posixnet/Jamfile
+++ b/src/tests/system/network/posixnet/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net posixnet ;
+SubDir HAIKU_TOP src tests system network posixnet ;
 
 UsePrivateHeaders private shared ;
 
diff --git a/src/tests/kits/net/posixnet/PosixNetTestAddon.cpp b/src/tests/system/network/posixnet/PosixNetTestAddon.cpp
similarity index 100%
rename from src/tests/kits/net/posixnet/PosixNetTestAddon.cpp
rename to src/tests/system/network/posixnet/PosixNetTestAddon.cpp
diff --git a/src/tests/kits/net/select_test.c b/src/tests/system/network/select_test.c
similarity index 100%
rename from src/tests/kits/net/select_test.c
rename to src/tests/system/network/select_test.c
diff --git a/src/tests/kits/net/select_test2.c b/src/tests/system/network/select_test2.c
similarity index 100%
rename from src/tests/kits/net/select_test2.c
rename to src/tests/system/network/select_test2.c
diff --git a/src/tests/kits/net/select_test_big.c b/src/tests/system/network/select_test_big.c
similarity index 100%
rename from src/tests/kits/net/select_test_big.c
rename to src/tests/system/network/select_test_big.c
diff --git a/src/tests/kits/net/sock/Jamfile b/src/tests/system/network/sock/Jamfile
similarity index 85%
rename from src/tests/kits/net/sock/Jamfile
rename to src/tests/system/network/sock/Jamfile
index f8f687930c..7178201715 100644
--- a/src/tests/kits/net/sock/Jamfile
+++ b/src/tests/system/network/sock/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net sock ;
+SubDir HAIKU_TOP src tests system network sock ;
 
 UseHeaders $(SUBDIR) : true ;
 
diff --git a/src/tests/kits/net/sock/addrinfo.h b/src/tests/system/network/sock/addrinfo.h
similarity index 100%
rename from src/tests/kits/net/sock/addrinfo.h
rename to src/tests/system/network/sock/addrinfo.h
diff --git a/src/tests/kits/net/sock/buffers.c b/src/tests/system/network/sock/buffers.c
similarity index 100%
rename from src/tests/kits/net/sock/buffers.c
rename to src/tests/system/network/sock/buffers.c
diff --git a/src/tests/kits/net/sock/cliopen.c b/src/tests/system/network/sock/cliopen.c
similarity index 100%
rename from src/tests/kits/net/sock/cliopen.c
rename to src/tests/system/network/sock/cliopen.c
diff --git a/src/tests/kits/net/sock/config.h b/src/tests/system/network/sock/config.h
similarity index 100%
rename from src/tests/kits/net/sock/config.h
rename to src/tests/system/network/sock/config.h
diff --git a/src/tests/kits/net/sock/crlf.c b/src/tests/system/network/sock/crlf.c
similarity index 100%
rename from src/tests/kits/net/sock/crlf.c
rename to src/tests/system/network/sock/crlf.c
diff --git a/src/tests/kits/net/sock/error.c b/src/tests/system/network/sock/error.c
similarity index 100%
rename from src/tests/kits/net/sock/error.c
rename to src/tests/system/network/sock/error.c
diff --git a/src/tests/kits/net/sock/global.h b/src/tests/system/network/sock/global.h
similarity index 100%
rename from src/tests/kits/net/sock/global.h
rename to src/tests/system/network/sock/global.h
diff --git a/src/tests/kits/net/sock/looptcp.c b/src/tests/system/network/sock/looptcp.c
similarity index 100%
rename from src/tests/kits/net/sock/looptcp.c
rename to src/tests/system/network/sock/looptcp.c
diff --git a/src/tests/kits/net/sock/loopudp.c b/src/tests/system/network/sock/loopudp.c
similarity index 100%
rename from src/tests/kits/net/sock/loopudp.c
rename to src/tests/system/network/sock/loopudp.c
diff --git a/src/tests/kits/net/sock/main.c b/src/tests/system/network/sock/main.c
similarity index 100%
rename from src/tests/kits/net/sock/main.c
rename to src/tests/system/network/sock/main.c
diff --git a/src/tests/kits/net/sock/multicast.c b/src/tests/system/network/sock/multicast.c
similarity index 100%
rename from src/tests/kits/net/sock/multicast.c
rename to src/tests/system/network/sock/multicast.c
diff --git a/src/tests/kits/net/sock/ourhdr.h b/src/tests/system/network/sock/ourhdr.h
similarity index 100%
rename from src/tests/kits/net/sock/ourhdr.h
rename to src/tests/system/network/sock/ourhdr.h
diff --git a/src/tests/kits/net/sock/pattern.c b/src/tests/system/network/sock/pattern.c
similarity index 100%
rename from src/tests/kits/net/sock/pattern.c
rename to src/tests/system/network/sock/pattern.c
diff --git a/src/tests/kits/net/sock/servopen.c b/src/tests/system/network/sock/servopen.c
similarity index 100%
rename from src/tests/kits/net/sock/servopen.c
rename to src/tests/system/network/sock/servopen.c
diff --git a/src/tests/kits/net/sock/sinktcp.c b/src/tests/system/network/sock/sinktcp.c
similarity index 100%
rename from src/tests/kits/net/sock/sinktcp.c
rename to src/tests/system/network/sock/sinktcp.c
diff --git a/src/tests/kits/net/sock/sinkudp.c b/src/tests/system/network/sock/sinkudp.c
similarity index 100%
rename from src/tests/kits/net/sock/sinkudp.c
rename to src/tests/system/network/sock/sinkudp.c
diff --git a/src/tests/kits/net/sock/sleepus.c b/src/tests/system/network/sock/sleepus.c
similarity index 100%
rename from src/tests/kits/net/sock/sleepus.c
rename to src/tests/system/network/sock/sleepus.c
diff --git a/src/tests/kits/net/sock/sock.h b/src/tests/system/network/sock/sock.h
similarity index 100%
rename from src/tests/kits/net/sock/sock.h
rename to src/tests/system/network/sock/sock.h
diff --git a/src/tests/kits/net/sock/sockopts.c b/src/tests/system/network/sock/sockopts.c
similarity index 100%
rename from src/tests/kits/net/sock/sockopts.c
rename to src/tests/system/network/sock/sockopts.c
diff --git a/src/tests/kits/net/sock/sourceroute.c b/src/tests/system/network/sock/sourceroute.c
similarity index 100%
rename from src/tests/kits/net/sock/sourceroute.c
rename to src/tests/system/network/sock/sourceroute.c
diff --git a/src/tests/kits/net/sock/sourcetcp.c b/src/tests/system/network/sock/sourcetcp.c
similarity index 100%
rename from src/tests/kits/net/sock/sourcetcp.c
rename to src/tests/system/network/sock/sourcetcp.c
diff --git a/src/tests/kits/net/sock/sourceudp.c b/src/tests/system/network/sock/sourceudp.c
similarity index 100%
rename from src/tests/kits/net/sock/sourceudp.c
rename to src/tests/system/network/sock/sourceudp.c
diff --git a/src/tests/kits/net/sock/tellwait.c b/src/tests/system/network/sock/tellwait.c
similarity index 100%
rename from src/tests/kits/net/sock/tellwait.c
rename to src/tests/system/network/sock/tellwait.c
diff --git a/src/tests/kits/net/sock/write.c b/src/tests/system/network/sock/write.c
similarity index 100%
rename from src/tests/kits/net/sock/write.c
rename to src/tests/system/network/sock/write.c
diff --git a/src/tests/kits/net/sock/writen.c b/src/tests/system/network/sock/writen.c
similarity index 100%
rename from src/tests/kits/net/sock/writen.c
rename to src/tests/system/network/sock/writen.c
diff --git a/src/tests/kits/net/stop_stack.c b/src/tests/system/network/stop_stack.c
similarity index 100%
rename from src/tests/kits/net/stop_stack.c
rename to src/tests/system/network/stop_stack.c
diff --git a/src/tests/kits/net/tcp_client.c b/src/tests/system/network/tcp_client.c
similarity index 100%
rename from src/tests/kits/net/tcp_client.c
rename to src/tests/system/network/tcp_client.c
diff --git a/src/tests/kits/net/tcp_connection_test.cpp b/src/tests/system/network/tcp_connection_test.cpp
similarity index 100%
rename from src/tests/kits/net/tcp_connection_test.cpp
rename to src/tests/system/network/tcp_connection_test.cpp
diff --git a/src/tests/kits/net/tcp_server.c b/src/tests/system/network/tcp_server.c
similarity index 100%
rename from src/tests/kits/net/tcp_server.c
rename to src/tests/system/network/tcp_server.c
diff --git a/src/tests/kits/net/tcp_shell/BufferQueueTest.cpp b/src/tests/system/network/tcp_shell/BufferQueueTest.cpp
similarity index 100%
rename from src/tests/kits/net/tcp_shell/BufferQueueTest.cpp
rename to src/tests/system/network/tcp_shell/BufferQueueTest.cpp
diff --git a/src/tests/kits/net/tcp_shell/Jamfile b/src/tests/system/network/tcp_shell/Jamfile
similarity index 88%
rename from src/tests/kits/net/tcp_shell/Jamfile
rename to src/tests/system/network/tcp_shell/Jamfile
index 3a4e2fbbb3..dd48b2c4e5 100644
--- a/src/tests/kits/net/tcp_shell/Jamfile
+++ b/src/tests/system/network/tcp_shell/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net tcp_shell ;
+SubDir HAIKU_TOP src tests system network tcp_shell ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -43,18 +43,18 @@ SimpleTest BufferQueueTest :
 	: be libkernelland_emu.so
 ;
 
-SEARCH on [ FGristFiles 
+SEARCH on [ FGristFiles
 		tcp.cpp TCPEndpoint.cpp BufferQueue.cpp EndpointManager.cpp
 	] = [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols tcp ] ;
 
-SEARCH on [ FGristFiles 
+SEARCH on [ FGristFiles
 		ipv4_address.cpp
 	] = [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ;
 
-SEARCH on [ FGristFiles 
+SEARCH on [ FGristFiles
 		ancillary_data.cpp net_buffer.cpp utility.cpp
 	] = [ FDirName $(HAIKU_TOP) src add-ons kernel network stack ] ;
 
-SEARCH on [ FGristFiles 
+SEARCH on [ FGristFiles
 		argv.c
 	] = [ FDirName $(HAIKU_TOP) src tests add-ons kernel file_systems fs_shell ] ;
diff --git a/src/tests/kits/net/tcp_shell/tcp_shell.cpp b/src/tests/system/network/tcp_shell/tcp_shell.cpp
similarity index 100%
rename from src/tests/kits/net/tcp_shell/tcp_shell.cpp
rename to src/tests/system/network/tcp_shell/tcp_shell.cpp
diff --git a/src/tests/kits/net/tcptester/Jamfile b/src/tests/system/network/tcptester/Jamfile
similarity index 59%
rename from src/tests/kits/net/tcptester/Jamfile
rename to src/tests/system/network/tcptester/Jamfile
index e341e41086..f8d60f1218 100644
--- a/src/tests/kits/net/tcptester/Jamfile
+++ b/src/tests/system/network/tcptester/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kits net tcptester ;
+SubDir HAIKU_TOP src tests system network tcptester ;
 
 BinCommand tcptester :
 	tcptester.cpp
diff --git a/src/tests/kits/net/tcptester/tcptester.cpp b/src/tests/system/network/tcptester/tcptester.cpp
similarity index 100%
rename from src/tests/kits/net/tcptester/tcptester.cpp
rename to src/tests/system/network/tcptester/tcptester.cpp
diff --git a/src/tests/kits/net/test1.c b/src/tests/system/network/test1.c
similarity index 100%
rename from src/tests/kits/net/test1.c
rename to src/tests/system/network/test1.c
diff --git a/src/tests/kits/net/test2.c b/src/tests/system/network/test2.c
similarity index 100%
rename from src/tests/kits/net/test2.c
rename to src/tests/system/network/test2.c
diff --git a/src/tests/kits/net/test3.c b/src/tests/system/network/test3.c
similarity index 100%
rename from src/tests/kits/net/test3.c
rename to src/tests/system/network/test3.c
diff --git a/src/tests/kits/net/udp_client.c b/src/tests/system/network/udp_client.c
similarity index 100%
rename from src/tests/kits/net/udp_client.c
rename to src/tests/system/network/udp_client.c
diff --git a/src/tests/kits/net/udp_connect.cpp b/src/tests/system/network/udp_connect.cpp
similarity index 100%
rename from src/tests/kits/net/udp_connect.cpp
rename to src/tests/system/network/udp_connect.cpp
diff --git a/src/tests/kits/net/udp_echo.c b/src/tests/system/network/udp_echo.c
similarity index 100%
rename from src/tests/kits/net/udp_echo.c
rename to src/tests/system/network/udp_echo.c
diff --git a/src/tests/kits/net/udp_server.c b/src/tests/system/network/udp_server.c
similarity index 100%
rename from src/tests/kits/net/udp_server.c
rename to src/tests/system/network/udp_server.c
diff --git a/src/tests/kits/net/ufunc.c b/src/tests/system/network/ufunc.c
similarity index 100%
rename from src/tests/kits/net/ufunc.c
rename to src/tests/system/network/ufunc.c
diff --git a/src/tests/kits/net/ufunc.h b/src/tests/system/network/ufunc.h
similarity index 100%
rename from src/tests/kits/net/ufunc.h
rename to src/tests/system/network/ufunc.h