3 files changed, 86 insertions, 49 deletions

diff --git a/test/network/configure b/test/network/configure
new file mode 100755
index 000000000..788c5a9a0
--- /dev/null
+++ b/test/network/configure
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+brctl addbr br0
+ifconfig br0 10.10.20.1/29 up
+# NAT masquerade
+iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE
+# port forwarding
+# iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80
+        
+brctl addbr br1
+ifconfig br1 10.10.30.1/24 up
+brctl addbr br2
+ifconfig br2 10.10.40.1/24 up
+brctl addbr br3
+ifconfig br3 10.10.50.1/24 up
+brctl addbr br4
+ifconfig br4 10.10.60.1/24 up
+ip link add link eth0 name eth0.5 type vlan id 5
+/sbin/ifconfig eth0.5 10.10.205.10/24 up
+ip link add link eth0 name eth0.6 type vlan id 6
+/sbin/ifconfig eth0.6 10.10.206.10/24 up
+ip link add link eth0 name eth0.7 type vlan id 7
+/sbin/ifconfig eth0.7 10.10.207.10/24 up
+
diff --git a/test/network/network.sh b/test/network/network.sh
new file mode 100755
index 000000000..7b6d66e34
--- /dev/null
+++ b/test/network/network.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
+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
+
+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: netfilter (net_netfilter.exp)"
+./net_netfilter.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/test.sh b/test/test.sh
index 9d7dba4fa..78a6adc43 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -179,55 +179,6 @@ echo "TESTING: read/write /dev/shm (fs_dev_shm.exp)"
 echo "TESTING: quiet (quiet.exp)"
 ./quiet.exp
 
-echo "TESTING: IPv6 support (ip6.exp)"
-echo "TESTING:    broken on Centos - todo"
-./ip6.exp
-
-echo "TESTING: local network (net_local.exp)"
-./net_local.exp
-
-echo "TESTING: no network (net_none.exp)"
-./net_none.exp
-
-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: netfilter (net_netfilter.exp)"
-./net_netfilter.exp
-
-echo "TESTING: 4 bridges ARP (4bridges_arp.exp)"
-./4bridges_arp.exp
-
-echo "TESTING: 4 bridges IP (4bridges_ip.exp)"
-./4bridges_ip.exp
 
 echo "TESTING: login SSH (login_ssh.exp)"
 ./login_ssh.exp