Add default settings file for nitsi tests

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

diff --git a/Makefile.am b/Makefile.am
index b976da661c50475f15b82bcf92a2c7c0a5ea79e3..54460535f1c4ce4bb2e87ecbd330b77af3daac72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -585,25 +585,57 @@ 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/make-install \
+       test/nitsi/include/network-reset \
+       test/nitsi/include/network-settings
+
+EXTRA_DIST += \
+       test/nitsi/include/make-install.in
+       test/nitsi/include/network-reset \
+       test/nitsi/include/network-settings
+
+CLEANFILES += \
+       test/nitsi/include/make-install
+
 NITSI_TESTS = \
        test/nitsi/test/hello-world \
-       test/nitsi/test/make-check
+       test/nitsi/test/make-check \
+       test/nitsi/test/raw-device-get-by-mac \
+       test/nitsi/test/zone-new-bridge \
+       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 \
-       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/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/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-up_down/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 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)