nitsi: Rename make-install include file to setup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 2e073b661eba061f56b0da51440ca4de95c115c7..786442c813673ffc5c3cbfdb428ebb82a54c78fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -586,13 +586,13 @@ 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/setup
 
 EXTRA_DIST += \
-       test/nitsi/include/make-install.in
+       test/nitsi/include/setup.in
 
 CLEANFILES += \
-       test/nitsi/include/make-install
+       test/nitsi/include/setup
 
 NITSI_TESTS = \
        test/nitsi/test/hello-world \

diff --git a/test/nitsi/include/.gitignore b/test/nitsi/include/.gitignore
index 3a751349a74997cd03dd810d23e13527783c61de..146f275e098bbb4f14dc00618ad01c313f199b1e 100644 (file)
--- a/test/nitsi/include/.gitignore
+++ b/test/nitsi/include/.gitignore
@@ -1 +1 @@
-make-install
+setup

diff --git a/test/nitsi/include/make-install.in b/test/nitsi/include/setup.in
similarity index 100%
rename from test/nitsi/include/make-install.in
rename to test/nitsi/include/setup.in

diff --git a/test/nitsi/include/vpn-base b/test/nitsi/include/vpn-base
index 4e62763d84ea232908f80e5780dc4be7c00b69d1..44825db1984a32b13fb590ac65455c5813dc49d8 100644 (file)
--- a/test/nitsi/include/vpn-base
+++ b/test/nitsi/include/vpn-base
@@ -1,5 +1,5 @@
 # This contains the basic network configuration for all vpn-tests
-include: ../include/make-install
+include: ../include/setup
 include: ../include/alice-port-vars
 include: ../include/bob-port-vars
 all: network zone new upl0 bridge

diff --git a/test/nitsi/test/raw-device-get-by-mac/recipe b/test/nitsi/test/raw-device-get-by-mac/recipe
index e22454ef5168ba4d65ae4ca06cda57b99f567a91..61ea1fbd61e4a004f05c9202cced8fb857ff1865 100644 (file)
--- a/test/nitsi/test/raw-device-get-by-mac/recipe
+++ b/test/nitsi/test/raw-device-get-by-mac/recipe
@@ -1,6 +1,4 @@
-include: ../../include/make-install
-include: ../../include/network-settings
-include: ../../include/network-reset
+include: ../../include/setup
 alice: port="$(network raw device-get-by-mac-address "52:54:00:8a:b8:b5")"
 alice: echo $port
 alice: [ "52:54:00:8a:b8:b5" = "$(cat /sys/class/net/${port}/address)" ]

diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe
index 01faf6cd2396d1afb06dccfe5660bddaf7e5a597..a1ae1807837e47f9eda5b246489832add8147708 100644 (file)
--- a/test/nitsi/test/zone-new-bridge/recipe
+++ b/test/nitsi/test/zone-new-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/make-install
+include: ../../include/setup
 
 alice: network zone new upl0 bridge
 # this returns zero if the device exists

diff --git a/test/nitsi/test/zone-port-attach-bridge/recipe b/test/nitsi/test/zone-port-attach-bridge/recipe
index 2edba5d95f988e35cbeba05a20ca7b160c4f11b8..3abf294d335fd241d755c464c7ef0ddd973be220 100644 (file)
--- a/test/nitsi/test/zone-port-attach-bridge/recipe
+++ b/test/nitsi/test/zone-port-attach-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/make-install
+include: ../../include/setup
 
 alice: network zone new upl0 bridge
 # Create a dummy port we can attach to upl0