projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename REQ_SPTPS to SPTPS_PACKET.
[tinc]
/
test
/
testlib.sh
diff --git
a/test/testlib.sh
b/test/testlib.sh
index
635bafe
..
3103335
100644
(file)
--- a/
test/testlib.sh
+++ b/
test/testlib.sh
@@
-5,6
+5,7
@@
tincd=../src/tincd
tinc=../src/tinc
sptps_test=../src/sptps_test
tincd=../src/tincd
tinc=../src/tinc
sptps_test=../src/sptps_test
+sptps_keypair=../src/sptps_keypair
# Test directories
# Test directories
@@
-21,10
+22,6
@@
case "$_" in
;;
esac
;;
esac
-# Remove test directories
-
-rm -rf $d1 $d2 $d3
-
# Default arguments for both tinc and tincd
c1="--config=$d1 --pidfile=$d1/pid"
# Default arguments for both tinc and tincd
c1="--config=$d1 --pidfile=$d1/pid"
@@
-34,8
+31,18
@@
c3="--config=$d3 --pidfile=$d3/pid"
# Arguments when running tincd
r1="--logfile=$d1/log -d5"
# 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
# Exit on errors, log all commands being executed