Add default settings file for nitsi tests

This makes writing a test much faster.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/.gitignore b/.gitignore
index 4795273034a190d49dda1e76caaf50da4b33667b..a6df183b7df70cd607c661e98ba8b924793d0c7b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /src/network.pc
 /src/ppp/ip-updown
 /src/systemd/*.service
+/test/nitsi/test/settings
 /tmp
 /*.tar.bz2
 /*.tar.gz

diff --git a/Makefile.am b/Makefile.am
index fa12f4e77a071f997875553f0cf81b3057558b33..54460535f1c4ce4bb2e87ecbd330b77af3daac72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -606,6 +606,7 @@ NITSI_TESTS = \
        test/nitsi/test/zone-port-attach-bridge
 
 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 \
@@ -615,20 +616,26 @@ 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/zone-up_down/recipe \
+       test/nitsi/test/zone-up_down/settings.in \
+       test/nitsi/test/vpn-ipsec-ipv64-ipv4-vti/recipe
 
 CLEANFILES += \
+       test/nitsi/test/settings \
        test/nitsi/test/make-check/recipe \
        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
+       test/nitsi/test/zone-port-attach-bridge/settings \
+       test/nitsi/test/zone-up_down/settings
 
 NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
-       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@
+$(NITSI_TESTS): % : %/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
 
 .PHONY: nitsi
 nitsi: dist $(NITSI_TESTS)

diff --git a/test/nitsi/test/settings.in b/test/nitsi/test/settings.in
new file mode 100644 (file)
index 0000000..1a15d20
--- /dev/null
+++ b/test/nitsi/test/settings.in
@@ -0,0 +1,6 @@
+[GENERAL]
+copy_from = ../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz ../../../strongswan.conf
+copy_to = /root/
+
+[VIRTUAL_ENVIRONMENT]
+path = ../virtual-environment/basic