projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix calling freeaddrinfo() on the wrong pointer.
[tinc]
/
test
/
testlib.sh
diff --git
a/test/testlib.sh
b/test/testlib.sh
index
d60b9da
..
75b60a7
100644
(file)
--- a/
test/testlib.sh
+++ b/
test/testlib.sh
@@
-5,25
+5,14
@@
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
-case "$_" in
- /*)
- d1=$_.1
- d2=$_.2
- d3=$_.3
- ;;
- *)
- d1=$PWD/$_.1
- d2=$PWD/$_.2
- d3=$PWD/$_.3
- ;;
-esac
-
-# Remove test directories
-
-rm -rf $d1 $d2 $d3
+scriptname=`basename $0`
+d1=$PWD/$scriptname.1
+d2=$PWD/$scriptname.2
+d3=$PWD/$scriptname.3
# Default arguments for both tinc and tincd
# Default arguments for both tinc and tincd
@@
-37,6
+26,16
@@
r1="--logfile=$d1/log -d5"
r2="--logfile=$d2/log -d5"
r3="--logfile=$d3/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
set -ex
# Exit on errors, log all commands being executed
set -ex