X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=30d7faed832394032016dd44e98980c2d0f73923;hb=4f0218de6bafa3cd4bcffbfba79a4cc3e2f1e8e8;hp=3688508353a7206a9f9708372b7a1e9aec7b637c;hpb=ae7a79dae0518a09d68eb201f3cae9f07bc6e9ed;p=people%2Fms%2Fnetwork.git

diff --git a/Makefile.am b/Makefile.am
index 36885083..30d7faed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,12 +193,12 @@ dist_network_DATA = \
 	src/network-radvd-config \
 	src/header-config \
 	src/header-port \
-	src/header-zone \
-	src/ppp/dialer \
-	src/ppp/pppoe-server
+	src/header-zone
 
 dist_network_SCRIPTS = \
-	src/dhclient-helper
+	src/dhclient-helper \
+	src/ppp/dialer \
+	src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
 	src/helpers/dhcpd-config-helper \
@@ -232,8 +232,8 @@ dist_hooks_ports_SCRIPTS = \
 	src/hooks/ports/wireless-mesh
 
 dist_hooks_zones_SCRIPTS = \
-	src/hooks/zones/6to4-tunnel \
 	src/hooks/zones/bridge \
+	src/hooks/zones/ip-tunnel \
 	src/hooks/zones/modem \
 	src/hooks/zones/pppoe \
 	src/hooks/zones/wireless
@@ -442,9 +442,9 @@ MANPAGES = \
 	man/network-vpn.8 \
 	man/network-vpn-security-policies.8 \
 	man/network-zone.8 \
-	man/network-zone-6to4-tunnel.8 \
 	man/network-zone-bridge.8 \
 	man/network-zone-config-pppoe-server.8 \
+	man/network-zone-ip-tunnel.8 \
 	man/network-zone-modem.8 \
 	man/network-zone-pppoe.8 \
 	man/network-zone-wireless.8
@@ -597,17 +597,22 @@ CLEANFILES += \
 	test/nitsi/include/setup
 
 NITSI_TESTS = \
-	test/nitsi/test/hello-world \
 	test/nitsi/test/make-check \
 	test/nitsi/test/phase1 \
+	test/nitsi/test/pppoe \
 	test/nitsi/test/raw-device-get-by-mac \
 	test/nitsi/test/zone-new-bridge \
-	test/nitsi/test/zone-port-attach-bridge
+	test/nitsi/test/zone-port-attach-bridge \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6 \
+	test/nitsi/test/port-vlan
 
 EXTRA_DIST += \
 	test/nitsi/test/settings.in \
-	test/nitsi/test/hello-world/recipe \
-	test/nitsi/test/hello-world/settings \
 	test/nitsi/test/make-check/recipe.in \
 	test/nitsi/test/make-check/settings.in \
 	test/nitsi/test/raw-device-get-by-mac/recipe \
@@ -615,7 +620,21 @@ EXTRA_DIST += \
 	test/nitsi/test/zone-new-bridge/recipe \
 	test/nitsi/test/zone-new-bridge/settings.in \
 	test/nitsi/test/zone-port-attach-bridge/recipe \
-	test/nitsi/test/zone-port-attach-bridge/settings.in
+	test/nitsi/test/zone-port-attach-bridge/settings.in \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings \
+	test/nitsi/test/port-vlan/recipe \
+	test/nitsi/test/port-vlan/settings
 
 CLEANFILES += \
 	test/nitsi/test/settings \
@@ -628,12 +647,12 @@ CLEANFILES += \
 NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): % : %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
+$(NITSI_TESTS): % : dist %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
 	$(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ \
-		--default-settings $(abs_builddir)/test/nitsi/test/settings
+		--default-settings $(abs_builddir)/test/nitsi/test/settings --interactive-error-handling
 
 .PHONY: nitsi
-nitsi: dist $(NITSI_TESTS)
+nitsi: $(NITSI_TESTS)
 
 # Downloads a virtual image file and extracts it
 $(VIRTUAL_ENVIRONMENT_IMAGES):