From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Sep 2018 11:53:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'jschlag/master'
X-Git-Tag: 010~96
X-Git-Url: http://git.ipfire.org/?p=network.git;a=commitdiff_plain;h=ca35fc071a573d1043815b3e5e51a87878da278b

Merge remote-tracking branch 'jschlag/master'
---

ca35fc071a573d1043815b3e5e51a87878da278b
diff --cc Makefile.am
index 5307ff05,ae66e360..fe0b0c7b
--- a/Makefile.am
+++ b/Makefile.am
@@@ -599,10 -599,15 +599,16 @@@ CLEANFILES += 
  NITSI_TESTS = \
  	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-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
  
  EXTRA_DIST += \
  	test/nitsi/test/settings.in \