Merge remote-tracking branch 'jschlag/master'

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

diff --git a/Makefile.am b/Makefile.am
index 809c824f8a861adb8aebfc58e19442fd6f5a9db3..b28f03049f637a9ab4b1a4ed5bbac327f7fa8b5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -604,12 +604,13 @@ NITSI_TESTS = \
        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-ipv4-via-ipv4-vti \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti
+       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 \
@@ -621,18 +622,20 @@ EXTRA_DIST += \
        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-ipv4-via-ipv4-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/settings
+       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 \