From 4fbaf80d56a418ebd23eeace9053fa8f20097f77 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 20 Jul 2021 14:15:41 +0200 Subject: [PATCH] Fix running the test suite in out-of-tree builds. --- test/algorithms.test | 2 +- test/basic.test | 2 +- test/commandline.test | 2 +- test/executables.test | 2 +- test/import-export.test | 2 +- test/invite-join.test | 2 +- test/invite-offline.test | 2 +- test/invite-tinc-up.test | 2 +- test/legacy-protocol.test | 2 +- test/ns-ping.test | 2 +- test/scripts.test | 2 +- test/security.test | 2 +- test/sptps-basic.test | 4 ++-- test/variables.test | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/algorithms.test b/test/algorithms.test index 04d91310..bf073a56 100755 --- a/test/algorithms.test +++ b/test/algorithms.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize two nodes diff --git a/test/basic.test b/test/basic.test index d4d2cc6d..b2a3e472 100755 --- a/test/basic.test +++ b/test/basic.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize and test one node diff --git a/test/commandline.test b/test/commandline.test index 5d6e6a65..5e9fb85a 100755 --- a/test/commandline.test +++ b/test/commandline.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize one node diff --git a/test/executables.test b/test/executables.test index 28bff2a3..bc53aed2 100755 --- a/test/executables.test +++ b/test/executables.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Just test whether the executables work diff --git a/test/import-export.test b/test/import-export.test index 190d21ba..9b44e7af 100755 --- a/test/import-export.test +++ b/test/import-export.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize three nodes diff --git a/test/invite-join.test b/test/invite-join.test index 892767c7..58edd4a6 100755 --- a/test/invite-join.test +++ b/test/invite-join.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize one node diff --git a/test/invite-offline.test b/test/invite-offline.test index 61c0f0a3..2d7878d5 100755 --- a/test/invite-offline.test +++ b/test/invite-offline.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize one node diff --git a/test/invite-tinc-up.test b/test/invite-tinc-up.test index 6cf280be..8f09f5ed 100755 --- a/test/invite-tinc-up.test +++ b/test/invite-tinc-up.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize one node diff --git a/test/legacy-protocol.test b/test/legacy-protocol.test index 34466218..1aef8f28 100755 --- a/test/legacy-protocol.test +++ b/test/legacy-protocol.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize two nodes diff --git a/test/ns-ping.test b/test/ns-ping.test index 5931c75f..54a9199c 100755 --- a/test/ns-ping.test +++ b/test/ns-ping.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo "[STEP] Skip this test if we aren't root or if 'ip netns' does not exist" diff --git a/test/scripts.test b/test/scripts.test index a3678273..9ef64164 100755 --- a/test/scripts.test +++ b/test/scripts.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initializing server node diff --git a/test/security.test b/test/security.test index 91a5da52..815825ea 100755 --- a/test/security.test +++ b/test/security.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Skip this test if tools are missing diff --git a/test/sptps-basic.test b/test/sptps-basic.test index 34bef1a1..87aee021 100755 --- a/test/sptps-basic.test +++ b/test/sptps-basic.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Skip this test if we did not compile sptps_test @@ -22,7 +22,7 @@ $SPTPS_KEYPAIR "$client_priv" "$client_pub" echo [STEP] Test transfer of a simple file -reference=sptps-basic.test +reference=testlib.sh ( sleep 3 diff --git a/test/variables.test b/test/variables.test index d4c606fe..0164e27a 100755 --- a/test/variables.test +++ b/test/variables.test @@ -1,7 +1,7 @@ #!/bin/sh # shellcheck source=testlib.sh -. "${0%/*}/testlib.sh" +. ./testlib.sh echo [STEP] Initialize one node -- 2.20.1