Scripts now source dependencies using relative paths (previously breaking make depending on current directory).

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"
 

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

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

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

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"
 

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

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

test/140_weave_local_test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 weave_local_on() {
     host=$1

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

test/175_target_peer_persistence_3_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 
 assert_targets() {

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

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

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

test/205_dns_disabled_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.0.87
 

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

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"
 

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

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

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

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

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

test/250_dns_negative_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Negative DNS queries"
 

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

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

test/265_dns_reverse_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 IP=10.2.0.67
 

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

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

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"
 

test/295_dns_large_response_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=seetwo.weave.local
 

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

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"
 

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

test/330_reset_2_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Rolling restart with reset"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

test/500_weave_multi_cidr_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=multicidr.weave.local
 

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"
 

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"
 

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"
 

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}}" "$@"

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
 

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

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

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

test/640_proxy_restart_reattaches_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 NAME=seetwo.weave.local
 

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"
 

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.

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
 

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"
 

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"
 

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

test/685_proxy_weave_run_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1=10.2.1.13
 

test/690_proxy_config_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Various launch-proxy configurations"
 

test/695_proxy_failure_modes_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Proxy failure modes"
 

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
 

test/705_detect_hairpin_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Detect hairpin mode"
 

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

test/810_plugin_router_restart_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 C1_NAME=c1.weave.local
 

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"
 

test/830_cni_plugin_test.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 start_suite "Test CNI plugin"
 

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

test/sanity_check.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 set -e
 

test/setup.sh

@@ -4,7 +4,7 @@ set -e
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-. ./config.sh
+. "$(dirname "$0")/config.sh"
 
 (cd ./tls && ./tls $HOSTS)