From 0dff07dc8b8a07bf2570e7546151247a0af9a042 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Tue, 13 Dec 2016 16:00:37 +0000
Subject: [PATCH] Scripts now source dependencies using relative paths
 (previously breaking make depending on current directory).

---
 test/090_docker_restart_policy_2_test.sh       | 2 +-
 test/100_cross_hosts_2_test.sh                 | 2 +-
 test/105_frag_2_test.sh                        | 2 +-
 test/110_encryption_2_test.sh                  | 2 +-
 test/115_optional_encryption_2_test.sh         | 2 +-
 test/120_discovery_3_test.sh                   | 2 +-
 test/130_expose_test.sh                        | 2 +-
 test/140_weave_local_test.sh                   | 2 +-
 test/150_connect_forget_2_test.sh              | 2 +-
 test/175_target_peer_persistence_3_test.sh     | 2 +-
 test/190_no_fastdp_2_test.sh                   | 2 +-
 test/195_no_multicast_route_1_test.sh          | 2 +-
 test/200_dns_test.sh                           | 2 +-
 test/205_dns_disabled_test.sh                  | 2 +-
 test/210_dns_cross_hosts_3_test.sh             | 2 +-
 test/215_stale_dns_3_test.sh                   | 2 +-
 test/220_dns_custom_test.sh                    | 2 +-
 test/225_dns_subdomain_test.sh                 | 2 +-
 test/230_dns_unqualified_test.sh               | 2 +-
 test/240_dns_add_name_test.sh                  | 2 +-
 test/245_dns_case_insensitive_test.sh          | 2 +-
 test/250_dns_negative_test.sh                  | 2 +-
 test/255_dns_restart_test.sh                   | 2 +-
 test/260_dns_removal_test.sh                   | 2 +-
 test/265_dns_reverse_test.sh                   | 2 +-
 test/270_use_name_as_hostname_test.sh          | 2 +-
 test/280_with_or_without_dns_test.sh           | 2 +-
 test/290_dns_fallback_test.sh                  | 2 +-
 test/295_dns_large_response_test.sh            | 2 +-
 test/300_ip_reuse_test.sh                      | 2 +-
 test/310_docker_restart_test.sh                | 2 +-
 test/320_claim_3_test.sh                       | 2 +-
 test/330_reset_2_test.sh                       | 2 +-
 test/335_rmpeer_3_test.sh                      | 2 +-
 test/340_observers_cannot_vote_3_test.sh       | 2 +-
 test/350_observers_can_call_election_3_test.sh | 2 +-
 test/360_ipalloc_seed_mismatch_3_test.sh       | 2 +-
 test/362_ipalloc_range_change_test.sh          | 2 +-
 test/370_persist_ipam_2_test.sh                | 2 +-
 test/380_ipam_seed_2_test.sh                   | 2 +-
 test/500_weave_multi_cidr_test.sh              | 2 +-
 test/510_detach_hide_no_ipalloc_test.sh        | 2 +-
 test/600_proxy_docker_py.sh                    | 2 +-
 test/605_proxy_inspect_test.sh                 | 2 +-
 test/610_proxy_wait_for_weave_test.sh          | 2 +-
 test/615_proxy_rewrite_hosts_test.sh           | 2 +-
 test/620_proxy_entrypoint_command_test.sh      | 2 +-
 test/630_proxy_dns_test.sh                     | 2 +-
 test/635_proxy_dns_unqualified_test.sh         | 2 +-
 test/640_proxy_restart_reattaches_test.sh      | 2 +-
 test/650_proxy_env_test.sh                     | 2 +-
 test/655_proxy_large_http_chunks_test.sh       | 2 +-
 test/660_proxy_ipam_2_test.sh                  | 2 +-
 test/666_abuse_of_start_test.sh                | 2 +-
 test/670_proxy_tls_test.sh                     | 2 +-
 test/680_proxy_hostname_derivation_test.sh     | 2 +-
 test/685_proxy_weave_run_test.sh               | 2 +-
 test/690_proxy_config_test.sh                  | 2 +-
 test/695_proxy_failure_modes_test.sh           | 2 +-
 test/700_status_and_report_2_test.sh           | 2 +-
 test/705_detect_hairpin_test.sh                | 2 +-
 test/800_plugin_cross_hosts_2_test.sh          | 2 +-
 test/810_plugin_router_restart_test.sh         | 2 +-
 test/820_plugin_subnet_test.sh                 | 2 +-
 test/830_cni_plugin_test.sh                    | 2 +-
 test/840_weave_kube_3_test.sh                  | 2 +-
 test/sanity_check.sh                           | 2 +-
 test/setup.sh                                  | 2 +-
 68 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/test/090_docker_restart_policy_2_test.sh b/test/090_docker_restart_policy_2_test.sh
index 63d63cf2..b4cc76cd 100755
--- a/test/090_docker_restart_policy_2_test.sh
+++ b/test/090_docker_restart_policy_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Test docker restart policy"
 
diff --git a/test/100_cross_hosts_2_test.sh b/test/100_cross_hosts_2_test.sh
index bc6b0a40..8ef1fa39 100755
--- a/test/100_cross_hosts_2_test.sh
+++ b/test/100_cross_hosts_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.4
 C2=10.2.1.7
diff --git a/test/105_frag_2_test.sh b/test/105_frag_2_test.sh
index 3c42ba98..5a7564fa 100755
--- a/test/105_frag_2_test.sh
+++ b/test/105_frag_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.41
 C2=10.2.1.71
diff --git a/test/110_encryption_2_test.sh b/test/110_encryption_2_test.sh
index 205a9928..b6e11ea7 100755
--- a/test/110_encryption_2_test.sh
+++ b/test/110_encryption_2_test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.4
 C2=10.2.1.7
diff --git a/test/115_optional_encryption_2_test.sh b/test/115_optional_encryption_2_test.sh
index a84f2e65..89870b10 100755
--- a/test/115_optional_encryption_2_test.sh
+++ b/test/115_optional_encryption_2_test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Optional encryption via trusted subnets"
 
diff --git a/test/120_discovery_3_test.sh b/test/120_discovery_3_test.sh
index ef42e18a..82f2e5d3 100755
--- a/test/120_discovery_3_test.sh
+++ b/test/120_discovery_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.41
 C3=10.2.1.71
diff --git a/test/130_expose_test.sh b/test/130_expose_test.sh
index 9cc216eb..ccb00791 100755
--- a/test/130_expose_test.sh
+++ b/test/130_expose_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.34
 C2=10.2.1.37
diff --git a/test/140_weave_local_test.sh b/test/140_weave_local_test.sh
index 0874923f..806db06e 100755
--- a/test/140_weave_local_test.sh
+++ b/test/140_weave_local_test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 weave_local_on() {
     host=$1
diff --git a/test/150_connect_forget_2_test.sh b/test/150_connect_forget_2_test.sh
index 8b0eb544..4dcb5a15 100755
--- a/test/150_connect_forget_2_test.sh
+++ b/test/150_connect_forget_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.4
 C2=10.2.1.7
diff --git a/test/175_target_peer_persistence_3_test.sh b/test/175_target_peer_persistence_3_test.sh
index d880bb04..a78a12f3 100755
--- a/test/175_target_peer_persistence_3_test.sh
+++ b/test/175_target_peer_persistence_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 
 assert_targets() {
diff --git a/test/190_no_fastdp_2_test.sh b/test/190_no_fastdp_2_test.sh
index 41c31711..76e733bc 100755
--- a/test/190_no_fastdp_2_test.sh
+++ b/test/190_no_fastdp_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.46
 C2=10.2.1.47
diff --git a/test/195_no_multicast_route_1_test.sh b/test/195_no_multicast_route_1_test.sh
index 0cbd46df..740be6d6 100755
--- a/test/195_no_multicast_route_1_test.sh
+++ b/test/195_no_multicast_route_1_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 show_multicast_route_on() {
     exec_on $1 $2 ip route show 224.0.0.0/4
diff --git a/test/200_dns_test.sh b/test/200_dns_test.sh
index ae110030..982708f2 100755
--- a/test/200_dns_test.sh
+++ b/test/200_dns_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/205_dns_disabled_test.sh b/test/205_dns_disabled_test.sh
index 8799acbd..8a4192a9 100755
--- a/test/205_dns_disabled_test.sh
+++ b/test/205_dns_disabled_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.87
 
diff --git a/test/210_dns_cross_hosts_3_test.sh b/test/210_dns_cross_hosts_3_test.sh
index 23a2d42f..ee29fe9e 100755
--- a/test/210_dns_cross_hosts_3_test.sh
+++ b/test/210_dns_cross_hosts_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.3.78
 C2=10.2.3.34
diff --git a/test/215_stale_dns_3_test.sh b/test/215_stale_dns_3_test.sh
index f4315ffa..d3e97749 100755
--- a/test/215_stale_dns_3_test.sh
+++ b/test/215_stale_dns_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Check propagation of DNS entries when gossip is delayed"
 
diff --git a/test/220_dns_custom_test.sh b/test/220_dns_custom_test.sh
index bb404d32..8cd0e981 100755
--- a/test/220_dns_custom_test.sh
+++ b/test/220_dns_custom_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.56.34
 C2=10.2.54.91
diff --git a/test/225_dns_subdomain_test.sh b/test/225_dns_subdomain_test.sh
index 58d2716f..a40f13a4 100755
--- a/test/225_dns_subdomain_test.sh
+++ b/test/225_dns_subdomain_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.54.34
 C2=10.2.54.91
diff --git a/test/230_dns_unqualified_test.sh b/test/230_dns_unqualified_test.sh
index 0283d73f..1c5e9291 100755
--- a/test/230_dns_unqualified_test.sh
+++ b/test/230_dns_unqualified_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/240_dns_add_name_test.sh b/test/240_dns_add_name_test.sh
index 54cb0469..f7f498ae 100755
--- a/test/240_dns_add_name_test.sh
+++ b/test/240_dns_add_name_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/245_dns_case_insensitive_test.sh b/test/245_dns_case_insensitive_test.sh
index 9d032a89..47208833 100755
--- a/test/245_dns_case_insensitive_test.sh
+++ b/test/245_dns_case_insensitive_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.79
diff --git a/test/250_dns_negative_test.sh b/test/250_dns_negative_test.sh
index c879b6d2..c322feb6 100755
--- a/test/250_dns_negative_test.sh
+++ b/test/250_dns_negative_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Negative DNS queries"
 
diff --git a/test/255_dns_restart_test.sh b/test/255_dns_restart_test.sh
index d1d8e198..67680c65 100755
--- a/test/255_dns_restart_test.sh
+++ b/test/255_dns_restart_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/260_dns_removal_test.sh b/test/260_dns_removal_test.sh
index bc951d40..667f208d 100755
--- a/test/260_dns_removal_test.sh
+++ b/test/260_dns_removal_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.67
 C2=10.2.0.43
diff --git a/test/265_dns_reverse_test.sh b/test/265_dns_reverse_test.sh
index 0f7c8804..60d62f02 100755
--- a/test/265_dns_reverse_test.sh
+++ b/test/265_dns_reverse_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 IP=10.2.0.67
 
diff --git a/test/270_use_name_as_hostname_test.sh b/test/270_use_name_as_hostname_test.sh
index 377bb5aa..afb64b1c 100755
--- a/test/270_use_name_as_hostname_test.sh
+++ b/test/270_use_name_as_hostname_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=c1
 DOMAIN=weave.local
diff --git a/test/280_with_or_without_dns_test.sh b/test/280_with_or_without_dns_test.sh
index b75f14ce..1a7e1d4a 100755
--- a/test/280_with_or_without_dns_test.sh
+++ b/test/280_with_or_without_dns_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 IP=10.2.0.34
 TARGET=seetwo.weave.local
diff --git a/test/290_dns_fallback_test.sh b/test/290_dns_fallback_test.sh
index 1d897732..2161f155 100755
--- a/test/290_dns_fallback_test.sh
+++ b/test/290_dns_fallback_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Resolve a non-weave address"
 
diff --git a/test/295_dns_large_response_test.sh b/test/295_dns_large_response_test.sh
index 96c35153..dc210d8b 100755
--- a/test/295_dns_large_response_test.sh
+++ b/test/295_dns_large_response_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=seetwo.weave.local
 
diff --git a/test/300_ip_reuse_test.sh b/test/300_ip_reuse_test.sh
index 6369f1c8..5e7dcd15 100755
--- a/test/300_ip_reuse_test.sh
+++ b/test/300_ip_reuse_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.43
 C2=10.2.1.44
diff --git a/test/310_docker_restart_test.sh b/test/310_docker_restart_test.sh
index d1bff78f..e2d255a3 100755
--- a/test/310_docker_restart_test.sh
+++ b/test/310_docker_restart_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Containers get same IP address on restart"
 
diff --git a/test/320_claim_3_test.sh b/test/320_claim_3_test.sh
index 6f9b8602..c7bd900e 100755
--- a/test/320_claim_3_test.sh
+++ b/test/320_claim_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 UNIVERSE=10.2.0.0/16
 C1=10.2.128.1
diff --git a/test/330_reset_2_test.sh b/test/330_reset_2_test.sh
index 05d68677..89b8dc34 100755
--- a/test/330_reset_2_test.sh
+++ b/test/330_reset_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Rolling restart with reset"
 
diff --git a/test/335_rmpeer_3_test.sh b/test/335_rmpeer_3_test.sh
index fddd8253..ffdfc85b 100755
--- a/test/335_rmpeer_3_test.sh
+++ b/test/335_rmpeer_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "rmpeer reclaims IP addresses of lost peers"
 
diff --git a/test/340_observers_cannot_vote_3_test.sh b/test/340_observers_cannot_vote_3_test.sh
index 2670b407..0b44fcb2 100755
--- a/test/340_observers_cannot_vote_3_test.sh
+++ b/test/340_observers_cannot_vote_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Observers can't vote"
 
diff --git a/test/350_observers_can_call_election_3_test.sh b/test/350_observers_can_call_election_3_test.sh
index af058e62..833ee415 100755
--- a/test/350_observers_can_call_election_3_test.sh
+++ b/test/350_observers_can_call_election_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Observers can call election"
 
diff --git a/test/360_ipalloc_seed_mismatch_3_test.sh b/test/360_ipalloc_seed_mismatch_3_test.sh
index fd7c412f..c26a9d41 100755
--- a/test/360_ipalloc_seed_mismatch_3_test.sh
+++ b/test/360_ipalloc_seed_mismatch_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "IPAM ring seed mismatch"
 
diff --git a/test/362_ipalloc_range_change_test.sh b/test/362_ipalloc_range_change_test.sh
index d7fab65a..76a2d046 100755
--- a/test/362_ipalloc_range_change_test.sh
+++ b/test/362_ipalloc_range_change_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "IPAM alloc range change"
 
diff --git a/test/370_persist_ipam_2_test.sh b/test/370_persist_ipam_2_test.sh
index 91d4203c..0922bb1a 100755
--- a/test/370_persist_ipam_2_test.sh
+++ b/test/370_persist_ipam_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Checking persistence of IPAM"
 
diff --git a/test/380_ipam_seed_2_test.sh b/test/380_ipam_seed_2_test.sh
index 82184a8e..39e031b0 100755
--- a/test/380_ipam_seed_2_test.sh
+++ b/test/380_ipam_seed_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Specify initial IPAM seed"
 
diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh
index 13a5c466..6c9d8b5b 100755
--- a/test/500_weave_multi_cidr_test.sh
+++ b/test/500_weave_multi_cidr_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=multicidr.weave.local
 
diff --git a/test/510_detach_hide_no_ipalloc_test.sh b/test/510_detach_hide_no_ipalloc_test.sh
index 720e9eb3..e80901fd 100755
--- a/test/510_detach_hide_no_ipalloc_test.sh
+++ b/test/510_detach_hide_no_ipalloc_test.sh
@@ -7,7 +7,7 @@ check() {
     assert_raises "timeout 10 cat <( $CMD )"
 }
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "'detach' and 'hide' do not require IP allocation"
 
diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh
index 57a60233..f0a55222 100755
--- a/test/600_proxy_docker_py.sh
+++ b/test/600_proxy_docker_py.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Explicitly not called _test.sh - this isn't run, but imported by other tests.
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 IMAGE="joffrey/docker-py:1.8.1"
 
diff --git a/test/605_proxy_inspect_test.sh b/test/605_proxy_inspect_test.sh
index 15ba4fc5..919a502a 100755
--- a/test/605_proxy_inspect_test.sh
+++ b/test/605_proxy_inspect_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Check that docker inspect returns the weave IP"
 
diff --git a/test/610_proxy_wait_for_weave_test.sh b/test/610_proxy_wait_for_weave_test.sh
index a89edaf7..d372474d 100755
--- a/test/610_proxy_wait_for_weave_test.sh
+++ b/test/610_proxy_wait_for_weave_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 entrypoint() {
   docker_on $HOST1 inspect --format="{{.Config.Entrypoint}}" "$@"
diff --git a/test/615_proxy_rewrite_hosts_test.sh b/test/615_proxy_rewrite_hosts_test.sh
index 95f29047..a8629aab 100755
--- a/test/615_proxy_rewrite_hosts_test.sh
+++ b/test/615_proxy_rewrite_hosts_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 expected_ip=10.2.1.1
 
diff --git a/test/620_proxy_entrypoint_command_test.sh b/test/620_proxy_entrypoint_command_test.sh
index fad4b868..1085bcac 100755
--- a/test/620_proxy_entrypoint_command_test.sh
+++ b/test/620_proxy_entrypoint_command_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 build_image() {
     docker_on $HOST1 build -t $1 >/dev/null - <<- EOF
diff --git a/test/630_proxy_dns_test.sh b/test/630_proxy_dns_test.sh
index 0c6d6e43..a9031afb 100755
--- a/test/630_proxy_dns_test.sh
+++ b/test/630_proxy_dns_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/635_proxy_dns_unqualified_test.sh b/test/635_proxy_dns_unqualified_test.sh
index 2c2df7d2..1d18f460 100755
--- a/test/635_proxy_dns_unqualified_test.sh
+++ b/test/635_proxy_dns_unqualified_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/640_proxy_restart_reattaches_test.sh b/test/640_proxy_restart_reattaches_test.sh
index 0cb46eaa..9c99a082 100755
--- a/test/640_proxy_restart_reattaches_test.sh
+++ b/test/640_proxy_restart_reattaches_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=seetwo.weave.local
 
diff --git a/test/650_proxy_env_test.sh b/test/650_proxy_env_test.sh
index 345f661e..53969180 100755
--- a/test/650_proxy_env_test.sh
+++ b/test/650_proxy_env_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 CMD="run -e WEAVE_CIDR=10.2.1.4/24 $SMALL_IMAGE $CHECK_ETHWE_UP"
 
diff --git a/test/655_proxy_large_http_chunks_test.sh b/test/655_proxy_large_http_chunks_test.sh
index c3c6ac9f..ca540acb 100755
--- a/test/655_proxy_large_http_chunks_test.sh
+++ b/test/655_proxy_large_http_chunks_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Check the proxy handles arbitrarily large http chunks"
 # docker images returns all its data as one giant http chunk.
diff --git a/test/660_proxy_ipam_2_test.sh b/test/660_proxy_ipam_2_test.sh
index 7a9e7276..5d80871d 100755
--- a/test/660_proxy_ipam_2_test.sh
+++ b/test/660_proxy_ipam_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 UNIVERSE=10.2.2.0/24
 
diff --git a/test/666_abuse_of_start_test.sh b/test/666_abuse_of_start_test.sh
index 183c8f60..79f3551d 100755
--- a/test/666_abuse_of_start_test.sh
+++ b/test/666_abuse_of_start_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Abuse of 'start' operation"
 
diff --git a/test/670_proxy_tls_test.sh b/test/670_proxy_tls_test.sh
index 69cff352..6b48030e 100755
--- a/test/670_proxy_tls_test.sh
+++ b/test/670_proxy_tls_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Boot the proxy with TLS-enabled Docker support"
 
diff --git a/test/680_proxy_hostname_derivation_test.sh b/test/680_proxy_hostname_derivation_test.sh
index caab9229..e1729511 100755
--- a/test/680_proxy_hostname_derivation_test.sh
+++ b/test/680_proxy_hostname_derivation_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.78
 C2=10.2.0.34
diff --git a/test/685_proxy_weave_run_test.sh b/test/685_proxy_weave_run_test.sh
index 9ab16499..a7f85673 100755
--- a/test/685_proxy_weave_run_test.sh
+++ b/test/685_proxy_weave_run_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.13
 
diff --git a/test/690_proxy_config_test.sh b/test/690_proxy_config_test.sh
index 5359211b..8797e3f8 100755
--- a/test/690_proxy_config_test.sh
+++ b/test/690_proxy_config_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Various launch-proxy configurations"
 
diff --git a/test/695_proxy_failure_modes_test.sh b/test/695_proxy_failure_modes_test.sh
index aca0a5a8..56c5e953 100755
--- a/test/695_proxy_failure_modes_test.sh
+++ b/test/695_proxy_failure_modes_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Proxy failure modes"
 
diff --git a/test/700_status_and_report_2_test.sh b/test/700_status_and_report_2_test.sh
index fab9a1a7..1bb003cd 100755
--- a/test/700_status_and_report_2_test.sh
+++ b/test/700_status_and_report_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 UNIVERSE=10.2.0.0/16
 
diff --git a/test/705_detect_hairpin_test.sh b/test/705_detect_hairpin_test.sh
index 4ba915ed..801cbd21 100755
--- a/test/705_detect_hairpin_test.sh
+++ b/test/705_detect_hairpin_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Detect hairpin mode"
 
diff --git a/test/800_plugin_cross_hosts_2_test.sh b/test/800_plugin_cross_hosts_2_test.sh
index 477c0de8..ac4fdf00 100755
--- a/test/800_plugin_cross_hosts_2_test.sh
+++ b/test/800_plugin_cross_hosts_2_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1_NAME=c1.weave.local
 C2_NAME=seetwo.weave.local
diff --git a/test/810_plugin_router_restart_test.sh b/test/810_plugin_router_restart_test.sh
index 32e6fcc9..48ee230a 100755
--- a/test/810_plugin_router_restart_test.sh
+++ b/test/810_plugin_router_restart_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1_NAME=c1.weave.local
 
diff --git a/test/820_plugin_subnet_test.sh b/test/820_plugin_subnet_test.sh
index a566c140..15e49b92 100755
--- a/test/820_plugin_subnet_test.sh
+++ b/test/820_plugin_subnet_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Test Docker Network plugin with specified subnet"
 
diff --git a/test/830_cni_plugin_test.sh b/test/830_cni_plugin_test.sh
index c574803c..305ccf19 100755
--- a/test/830_cni_plugin_test.sh
+++ b/test/830_cni_plugin_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Test CNI plugin"
 
diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh
index b0906c07..473fca69 100755
--- a/test/840_weave_kube_3_test.sh
+++ b/test/840_weave_kube_3_test.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 tear_down_kubeadm() {
     for host in $HOSTS; do
diff --git a/test/sanity_check.sh b/test/sanity_check.sh
index a9c02745..55829fd6 100755
--- a/test/sanity_check.sh
+++ b/test/sanity_check.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 set -e
 
diff --git a/test/setup.sh b/test/setup.sh
index f999aff9..374a6518 100755
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -4,7 +4,7 @@ set -e
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 (cd ./tls && ./tls $HOSTS)