diff --git a/test/090_docker_restart_policy_2_test.sh b/test/090_docker_restart_policy_2_test.sh index 63d63cf260..b4cc76cd45 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 bc6b0a40a0..8ef1fa3971 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 3c42ba98cb..5a7564fa07 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 205a992803..b6e11ea754 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 a84f2e6590..89870b1023 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 ef42e18a35..82f2e5d3ac 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 9cc216eb77..ccb0079166 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 0874923f07..806db06e91 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 8b0eb54466..4dcb5a1581 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 d880bb0471..a78a12f33e 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 41c317111c..76e733bc47 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 0cbd46df93..740be6d682 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 ae110030ef..982708f275 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 8799acbd75..8a4192a9a9 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 23a2d42f94..ee29fe9ef0 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 f4315ffad6..d3e977492b 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 bb404d3240..8cd0e981f5 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 58d2716f58..a40f13a47b 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 0283d73f37..1c5e929130 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 54cb0469c6..f7f498ae1c 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 9d032a8998..4720883305 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 c879b6d24c..c322feb6c6 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 d1d8e198a7..67680c651e 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 bc951d40ed..667f208d96 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 0f7c88040e..60d62f023b 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 377bb5aa7b..afb64b1c02 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 b75f14cea2..1a7e1d4ace 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 1d89773206..2161f15534 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 96c35153fa..dc210d8bcd 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 6369f1c8fc..5e7dcd159d 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 d1bff78f6a..e2d255a324 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 6f9b860252..c7bd900eec 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 05d6867703..89b8dc346f 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 fddd82535b..ffdfc85b8d 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 2670b407f0..0b44fcb2c5 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 af058e62ff..833ee41513 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 fd7c412f15..c26a9d4119 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 d7fab65a1d..76a2d0466f 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 91d4203ce9..0922bb1a31 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 82184a8e37..39e031b049 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 13a5c46645..6c9d8b5bdb 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 720e9eb3ec..e80901fd93 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 57a602331e..f0a5522204 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 15ba4fc586..919a502af0 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 a89edaf772..d372474d2d 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 95f290474c..a8629aab00 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 fad4b868e3..1085bcac4a 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 0c6d6e438c..a9031afb8d 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 2c2df7d285..1d18f46091 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 0cb46eaa92..9c99a08262 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 345f661e5d..539691802d 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 c3c6ac9fad..ca540acb34 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 7a9e727677..5d80871da2 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 183c8f609f..79f3551dad 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 69cff3524a..6b48030ed1 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 caab922981..e172951164 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 9ab1649968..a7f8567384 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 5359211b3b..8797e3f8e8 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 aca0a5a81c..56c5e953ac 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 fab9a1a78d..1bb003cdc1 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 4ba915ed38..801cbd21fd 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 477c0de889..ac4fdf000c 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 32e6fcc99c..48ee230a54 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 a566c140b5..15e49b9283 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 c574803c15..305ccf190c 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 b0906c0756..473fca6997 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 a9c02745d3..55829fd6c8 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 f999aff94a..374a651820 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)