Add default settings file for nitsi tests

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

diff --git a/Makefile.am b/Makefile.am
index 1ea715e02a547435d9215619fd49606b2a63d1a3..54460535f1c4ce4bb2e87ecbd330b77af3daac72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -602,9 +602,11 @@ NITSI_TESTS = \
        test/nitsi/test/hello-world \
        test/nitsi/test/make-check \
        test/nitsi/test/raw-device-get-by-mac \
-       test/nitsi/test/zone-new-bridge
+       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 \
@@ -612,19 +614,28 @@ EXTRA_DIST += \
        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-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/raw-device-get-by-mac/settings \
-       test/nitsi/test/zone-new-bridge/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) $(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)