1 files changed, 94 insertions, 89 deletions
diff --git a/test/network/network.sh b/test/network/network.sh
index 0cb92f2e3..6bb8332ee 100755
--- a/test/network/network.sh
+++ b/test/network/network.sh
@@ -7,46 +7,13 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-sudo ./configure
+sudo brctl addbr br0
+sudo ip link set br0 up
-echo "TESTING: unconfigured network (net_unconfigured.exp)"
+sudo ip addr add 10.10.20.1/24 dev br0
-./net_unconfigured.exp
+sudo brctl addbr br1
+sudo ip link set br1 up
-echo "TESTING: netfilter template (netfilter-template.exp)"
+sudo ip addr add 10.10.30.1/24 dev br1
-rm -f ./tcpserver
+ip addr show
-gcc -o tcpserver tcpserver.c
-./netfilter-template.exp
-rm ./tcpserver
-echo "TESTING: firemon interface (firemon-interfaces.exp)"
-sudo ./firemon-interfaces.exp
-echo "TESTING: netns (netns.exp)"
-./netns.exp
-echo "TESTING: print dns (dns-print.exp)"
-./dns-print.exp
-echo "TESTING: firemon arp (firemon-arp.exp)"
-./firemon-arp.exp
-echo "TESTING: firemon netstats (netstats.exp)"
-./netstats.exp
-echo "TESTING: firemon route (firemon-route.exp)"
-./firemon-route.exp
-echo "TESTING: network profile (net_profile.exp)"
-./net_profile.exp
-echo "TESTING: bandwidth (bandwidth.exp)"
-./bandwidth.exp
-echo "TESTING: IPv6 support (ip6.exp)"
-./ip6.exp
-echo "TESTING: local network (net_local.exp)"
-./net_local.exp
 echo "TESTING: no network (net_none.exp)"
 ./net_none.exp
@@ -55,56 +22,94 @@ echo "TESTING: network IP (net_ip.exp)"
 ./net_ip.exp
 echo "TESTING: network MAC (net_mac.exp)"
-sleep 2
 ./net_mac.exp
-echo "TESTING: network MTU (net_mtu.exp)"
-./net_mtu.exp
-echo "TESTING: network hostname (hostname.exp)"
-./hostname.exp
-echo "TESTING: network bad IP (net_badip.exp)"
-./net_badip.exp
-echo "TESTING: network no IP test 1 (net_noip.exp)"
-./net_noip.exp
-echo "TESTING: network no IP test 2 (net_noip2.exp)"
-./net_noip2.exp
-echo "TESTING: network default gateway test 1 (net_defaultgw.exp)"
-./net_defaultgw.exp
-echo "TESTING: network default gateway test 2 (net_defaultgw2.exp)"
-./net_defaultgw2.exp
-echo "TESTING: network default gateway test 3 (net_defaultgw3.exp)"
-./net_defaultgw3.exp
-echo "TESTING: scan (net_scan.exp)"
-./net_scan.exp
-echo "TESTING: interface (interface.exp)"
-./interface.exp
-echo "TESTING: veth (net_veth.exp)"
-./net_veth.exp
-echo "TESTING: netfilter (net_netfilter.exp)"
-./net_netfilter.exp
-echo "TESTING: iprange (iprange.exp)"
-./iprange.exp
-echo "TESTING: veth-name (veth-name.exp)"
-./veth-name.exp
-echo "TESTING: macvlan2 (net_macvlan2.exp)"
-./net_macvlan2.exp
-echo "TESTING: 4 bridges ARP (4bridges_arp.exp)"
-./4bridges_arp.exp
-echo "TESTING: 4 bridges IP (4bridges_ip.exp)"
+#echo "TESTING: unconfigured network (net_unconfigured.exp)"
-./4bridges_ip.exp
+#./net_unconfigured.exp
+#
+#echo "TESTING: netfilter template (netfilter-template.exp)"
+#rm -f ./tcpserver
+#gcc -o tcpserver tcpserver.c
+#./netfilter-template.exp
+#rm ./tcpserver
+#
+#echo "TESTING: firemon interface (firemon-interfaces.exp)"
+#sudo ./firemon-interfaces.exp
+#
+#echo "TESTING: netns (netns.exp)"
+#./netns.exp
+#
+#echo "TESTING: print dns (dns-print.exp)"
+#./dns-print.exp
+#
+#echo "TESTING: firemon arp (firemon-arp.exp)"
+#./firemon-arp.exp
+#
+#echo "TESTING: firemon netstats (netstats.exp)"
+#./netstats.exp
+#
+#echo "TESTING: firemon route (firemon-route.exp)"
+#./firemon-route.exp
+#
+#echo "TESTING: network profile (net_profile.exp)"
+#./net_profile.exp
+#
+#echo "TESTING: bandwidth (bandwidth.exp)"
+#./bandwidth.exp
+#
+#echo "TESTING: IPv6 support (ip6.exp)"
+#./ip6.exp
+#
+#echo "TESTING: local network (net_local.exp)"
+#./net_local.exp
+#
+#
+#echo "TESTING: network MTU (net_mtu.exp)"
+#./net_mtu.exp
+#
+#echo "TESTING: network bad IP (net_badip.exp)"
+#./net_badip.exp
+#
+#echo "TESTING: network no IP test 1 (net_noip.exp)"
+#./net_noip.exp
+#
+#echo "TESTING: network no IP test 2 (net_noip2.exp)"
+#./net_noip2.exp
+#
+#echo "TESTING: network default gateway test 1 (net_defaultgw.exp)"
+#./net_defaultgw.exp
+#
+#echo "TESTING: network default gateway test 2 (net_defaultgw2.exp)"
+#./net_defaultgw2.exp
+#
+#echo "TESTING: network default gateway test 3 (net_defaultgw3.exp)"
+#./net_defaultgw3.exp
+#
+#echo "TESTING: scan (net_scan.exp)"
+#./net_scan.exp
+#
+#echo "TESTING: interface (interface.exp)"
+#./interface.exp
+#
+#echo "TESTING: veth (net_veth.exp)"
+#./net_veth.exp
+#
+#echo "TESTING: netfilter (net_netfilter.exp)"
+#./net_netfilter.exp
+#
+#echo "TESTING: iprange (iprange.exp)"
+#./iprange.exp
+#
+#echo "TESTING: veth-name (veth-name.exp)"
+#./veth-name.exp
+#
+#echo "TESTING: macvlan2 (net_macvlan2.exp)"
+#./net_macvlan2.exp
+#
+#echo "TESTING: 4 bridges ARP (4bridges_arp.exp)"
+#./4bridges_arp.exp
+#
+#echo "TESTING: 4 bridges IP (4bridges_ip.exp)"
+#./4bridges_ip.exp

diff --git a/test/network/network.sh b/test/network/network.sh index 0cb92f2e3..6bb8332ee 100755 --- a/test/network/network.sh +++ b/test/network/network.sh
@@ -7,46 +7,13 @@ export MALLOC_CHECK_=3
7	export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))	7	export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
8	export LC_ALL=C	8	export LC_ALL=C
9		9
10	sudo ./configure	10	sudo brctl addbr br0
11		11	sudo ip link set br0 up
12	echo "TESTING: unconfigured network (net_unconfigured.exp)"	12	sudo ip addr add 10.10.20.1/24 dev br0
13	./net_unconfigured.exp	13	sudo brctl addbr br1
14		14	sudo ip link set br1 up
15	echo "TESTING: netfilter template (netfilter-template.exp)"	15	sudo ip addr add 10.10.30.1/24 dev br1
16	rm -f ./tcpserver	16	ip addr show
17	gcc -o tcpserver tcpserver.c
18	./netfilter-template.exp
19	rm ./tcpserver
20
21	echo "TESTING: firemon interface (firemon-interfaces.exp)"
22	sudo ./firemon-interfaces.exp
23
24	echo "TESTING: netns (netns.exp)"
25	./netns.exp
26
27	echo "TESTING: print dns (dns-print.exp)"
28	./dns-print.exp
29
30	echo "TESTING: firemon arp (firemon-arp.exp)"
31	./firemon-arp.exp
32
33	echo "TESTING: firemon netstats (netstats.exp)"
34	./netstats.exp
35
36	echo "TESTING: firemon route (firemon-route.exp)"
37	./firemon-route.exp
38
39	echo "TESTING: network profile (net_profile.exp)"
40	./net_profile.exp
41
42	echo "TESTING: bandwidth (bandwidth.exp)"
43	./bandwidth.exp
44
45	echo "TESTING: IPv6 support (ip6.exp)"
46	./ip6.exp
47
48	echo "TESTING: local network (net_local.exp)"
49	./net_local.exp
50		17
51	echo "TESTING: no network (net_none.exp)"	18	echo "TESTING: no network (net_none.exp)"
52	./net_none.exp	19	./net_none.exp
@@ -55,56 +22,94 @@ echo "TESTING: network IP (net_ip.exp)"
55	./net_ip.exp	22	./net_ip.exp
56		23
57	echo "TESTING: network MAC (net_mac.exp)"	24	echo "TESTING: network MAC (net_mac.exp)"
58	sleep 2
59	./net_mac.exp	25	./net_mac.exp
60		26
61	echo "TESTING: network MTU (net_mtu.exp)"
62	./net_mtu.exp
63
64	echo "TESTING: network hostname (hostname.exp)"
65	./hostname.exp
66
67	echo "TESTING: network bad IP (net_badip.exp)"
68	./net_badip.exp
69
70	echo "TESTING: network no IP test 1 (net_noip.exp)"
71	./net_noip.exp
72
73	echo "TESTING: network no IP test 2 (net_noip2.exp)"
74	./net_noip2.exp
75
76	echo "TESTING: network default gateway test 1 (net_defaultgw.exp)"
77	./net_defaultgw.exp
78
79	echo "TESTING: network default gateway test 2 (net_defaultgw2.exp)"
80	./net_defaultgw2.exp
81
82	echo "TESTING: network default gateway test 3 (net_defaultgw3.exp)"
83	./net_defaultgw3.exp
84
85	echo "TESTING: scan (net_scan.exp)"
86	./net_scan.exp
87
88	echo "TESTING: interface (interface.exp)"
89	./interface.exp
90
91	echo "TESTING: veth (net_veth.exp)"
92	./net_veth.exp
93
94	echo "TESTING: netfilter (net_netfilter.exp)"
95	./net_netfilter.exp
96
97	echo "TESTING: iprange (iprange.exp)"
98	./iprange.exp
99
100	echo "TESTING: veth-name (veth-name.exp)"
101	./veth-name.exp
102
103	echo "TESTING: macvlan2 (net_macvlan2.exp)"
104	./net_macvlan2.exp
105		27
106	echo "TESTING: 4 bridges ARP (4bridges_arp.exp)"
107	./4bridges_arp.exp
108		28
109	echo "TESTING: 4 bridges IP (4bridges_ip.exp)"	29	#echo "TESTING: unconfigured network (net_unconfigured.exp)"
110	./4bridges_ip.exp	30	#./net_unconfigured.exp
		31	#
		32	#echo "TESTING: netfilter template (netfilter-template.exp)"
		33	#rm -f ./tcpserver
		34	#gcc -o tcpserver tcpserver.c
		35	#./netfilter-template.exp
		36	#rm ./tcpserver
		37	#
		38	#echo "TESTING: firemon interface (firemon-interfaces.exp)"
		39	#sudo ./firemon-interfaces.exp
		40	#
		41	#echo "TESTING: netns (netns.exp)"
		42	#./netns.exp
		43	#
		44	#echo "TESTING: print dns (dns-print.exp)"
		45	#./dns-print.exp
		46	#
		47	#echo "TESTING: firemon arp (firemon-arp.exp)"
		48	#./firemon-arp.exp
		49	#
		50	#echo "TESTING: firemon netstats (netstats.exp)"
		51	#./netstats.exp
		52	#
		53	#echo "TESTING: firemon route (firemon-route.exp)"
		54	#./firemon-route.exp
		55	#
		56	#echo "TESTING: network profile (net_profile.exp)"
		57	#./net_profile.exp
		58	#
		59	#echo "TESTING: bandwidth (bandwidth.exp)"
		60	#./bandwidth.exp
		61	#
		62	#echo "TESTING: IPv6 support (ip6.exp)"
		63	#./ip6.exp
		64	#
		65	#echo "TESTING: local network (net_local.exp)"
		66	#./net_local.exp
		67	#
		68	#
		69	#echo "TESTING: network MTU (net_mtu.exp)"
		70	#./net_mtu.exp
		71	#
		72	#echo "TESTING: network bad IP (net_badip.exp)"
		73	#./net_badip.exp
		74	#
		75	#echo "TESTING: network no IP test 1 (net_noip.exp)"
		76	#./net_noip.exp
		77	#
		78	#echo "TESTING: network no IP test 2 (net_noip2.exp)"
		79	#./net_noip2.exp
		80	#
		81	#echo "TESTING: network default gateway test 1 (net_defaultgw.exp)"
		82	#./net_defaultgw.exp
		83	#
		84	#echo "TESTING: network default gateway test 2 (net_defaultgw2.exp)"
		85	#./net_defaultgw2.exp
		86	#
		87	#echo "TESTING: network default gateway test 3 (net_defaultgw3.exp)"
		88	#./net_defaultgw3.exp
		89	#
		90	#echo "TESTING: scan (net_scan.exp)"
		91	#./net_scan.exp
		92	#
		93	#echo "TESTING: interface (interface.exp)"
		94	#./interface.exp
		95	#
		96	#echo "TESTING: veth (net_veth.exp)"
		97	#./net_veth.exp
		98	#
		99	#echo "TESTING: netfilter (net_netfilter.exp)"
		100	#./net_netfilter.exp
		101	#
		102	#echo "TESTING: iprange (iprange.exp)"
		103	#./iprange.exp
		104	#
		105	#echo "TESTING: veth-name (veth-name.exp)"
		106	#./veth-name.exp
		107	#
		108	#echo "TESTING: macvlan2 (net_macvlan2.exp)"
		109	#./net_macvlan2.exp
		110	#
		111	#echo "TESTING: 4 bridges ARP (4bridges_arp.exp)"
		112	#./4bridges_arp.exp
		113	#
		114	#echo "TESTING: 4 bridges IP (4bridges_ip.exp)"
		115	#./4bridges_ip.exp