tincd=../src/tincd
tinc=../src/tinc
sptps_test=../src/sptps_test
+sptps_keypair=../src/sptps_keypair
# Test directories
-d1=$PWD/$_.1
-d2=$PWD/$_.2
-d3=$PWD/$_.3
-
-# Remove test directories
-
-rm -rf $d1 $d2 $d3
+case "$_" in
+ /*)
+ d1=$_.1
+ d2=$_.2
+ d3=$_.3
+ ;;
+ *)
+ d1=$PWD/$_.1
+ d2=$PWD/$_.2
+ d3=$PWD/$_.3
+ ;;
+esac
# Default arguments for both tinc and tincd
# Arguments when running tincd
r1="--logfile=$d1/log -d5"
-r2="--logfile=$d1/log -d5"
-r3="--logfile=$d1/log -d5"
+r2="--logfile=$d2/log -d5"
+r3="--logfile=$d3/log -d5"
+
+# Check for leftover tinc daemons
+
+[ -f $d1/pid ] && $tinc $c1 stop
+[ -f $d2/pid ] && $tinc $c2 stop
+[ -f $d3/pid ] && $tinc $c3 stop
+
+# Remove test directories
+
+rm -rf $d1 $d2 $d3
# Exit on errors, log all commands being executed