Adjust include paths because of the new include path feature

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

diff --git a/test/nitsi/test/phase1/recipe b/test/nitsi/test/phase1/recipe
index 61e27f3ccd6d8cf475d69bc59f8b52708571c795..38234a06c322b7c84f9f92f14cfee4d3e5248ad3 100644 (file)
--- a/test/nitsi/test/phase1/recipe
+++ b/test/nitsi/test/phase1/recipe
@@ -1,5 +1,5 @@
-include: ../../include/setup
-include: ../../include/phase1
+include: setup
+include: phase1
 
 # Let Alice ping Bob
 alice: ping -c 5 192.168.100.102

diff --git a/test/nitsi/test/port-vlan/recipe b/test/nitsi/test/port-vlan/recipe
index aad19fd215631b3feaa1355a408d118c44fbf9f4..d41377b4c6886f57468561e7682d3eaee7b4bcf2 100644 (file)
--- a/test/nitsi/test/port-vlan/recipe
+++ b/test/nitsi/test/port-vlan/recipe
@@ -1,8 +1,8 @@
-include: ../../include/setup
+include: setup
 
 # This contains the basic network configuration for all vpn-tests
-include: ../../include/alice-port-vars
-include: ../../include/bob-port-vars
+include: alice-port-vars
+include: bob-port-vars
 
 # Create an uplink zone
 all: network zone new upl0 bridge --stp=off

diff --git a/test/nitsi/test/pppoe/recipe b/test/nitsi/test/pppoe/recipe
index a164a8381b9b979aa5ba8dbf37b21b069ea47f39..f639b449bd653292dd95c93cd0a12595844a34d2 100644 (file)
--- a/test/nitsi/test/pppoe/recipe
+++ b/test/nitsi/test/pppoe/recipe
@@ -1,8 +1,8 @@
-include: ../../include/setup
+include: setup
 
 # Get port names for Alice and Bob
-include: ../../include/alice-port-vars
-include: ../../include/bob-port-vars
+include: alice-port-vars
+include: bob-port-vars
 
 # Start a PPPoE server on Alice
 alice: 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 61ea1fbd61e4a004f05c9202cced8fb857ff1865..ccdcdfa7db7d4076814bba27e85c333e1034d954 100644 (file)
--- a/test/nitsi/test/raw-device-get-by-mac/recipe
+++ b/test/nitsi/test/raw-device-get-by-mac/recipe
@@ -1,4 +1,4 @@
-include: ../../include/setup
+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 a1ae1807837e47f9eda5b246489832add8147708..693dc024d0cbe828fe7918c4138560202f926457 100644 (file)
--- a/test/nitsi/test/zone-new-bridge/recipe
+++ b/test/nitsi/test/zone-new-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/setup
+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 3abf294d335fd241d755c464c7ef0ddd973be220..4efbd184de78f32ea42034e7cc7f19efb3e7b32a 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/setup
+include: setup
 
 alice: network zone new upl0 bridge
 # Create a dummy port we can attach to upl0