Makefile: Forgot to remove 6to4-tunnel hook

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 81393999cbc6148e56f3fdfe75d937a97794ac32..30d7faed832394032016dd44e98980c2d0f73923 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,10 +191,12 @@ dist_network_DATA = \
        src/functions/functions.wpa_supplicant \
        src/functions/functions.zone \
        src/network-radvd-config \
-       src/dhclient-helper \
        src/header-config \
        src/header-port \
-       src/header-zone \
+       src/header-zone
+
+dist_network_SCRIPTS = \
+       src/dhclient-helper \
        src/ppp/dialer \
        src/ppp/pppoe-server
 
@@ -230,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
@@ -440,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
@@ -563,13 +565,15 @@ EXTRA_DIST += \
        test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in \
        test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in \
        test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in \
-       test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in
+       test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in \
+       test/nitsi/virtual-environment/basic/settings.in
 
 CLEANFILES += \
        test/nitsi/virtual-environment/basic/machines/alice/machine.xml \
        test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml \
        test/nitsi/virtual-environment/basic/machines/bob/machine.xml \
-       test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml
+       test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml \
+       test/nitsi/virtual-environment/basic/settings
 
 # Virtual Machine Images
 VIRTUAL_ENVIRONMENT_IMAGES = \
@@ -583,28 +587,72 @@ VIRTUAL_ENVIRONMENT_IMAGES_DIR = $(abs_builddir)/test/nitsi/virtual-environment/
 VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
        https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
 
+NITSI_INCLUDE_RECIPES = \
+       test/nitsi/include/setup
+
+EXTRA_DIST += \
+       test/nitsi/include/setup.in
+
+CLEANFILES += \
+       test/nitsi/include/setup
+
 NITSI_TESTS = \
-       test/nitsi/test/hello-world \
-       test/nitsi/test/make-check
+       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/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/hello-world/recipe \
-       test/nitsi/test/hello-world/settings \
+       test/nitsi/test/settings.in \
        test/nitsi/test/make-check/recipe.in \
-       test/nitsi/test/make-check/settings.in
+       test/nitsi/test/make-check/settings.in \
+       test/nitsi/test/raw-device-get-by-mac/recipe \
+       test/nitsi/test/raw-device-get-by-mac/settings.in \
+       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/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 \
        test/nitsi/test/make-check/recipe \
-       test/nitsi/test/make-check/settings
+       test/nitsi/test/make-check/settings \
+       test/nitsi/test/raw-device-get-by-mac/settings \
+       test/nitsi/test/zone-new-bridge/settings \
+       test/nitsi/test/zone-port-attach-bridge/settings
 
 NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES)
-       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@
+$(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 --interactive-error-handling
 
 .PHONY: nitsi
-nitsi: dist $(NITSI_TESTS)
+nitsi: $(NITSI_TESTS)
 
 # Downloads a virtual image file and extracts it
 $(VIRTUAL_ENVIRONMENT_IMAGES):