Clean up leftover tincd and sptps_test processes.

diff --git a/test/Makefile.am b/test/Makefile.am
index 4cb5f3f0f06132133bb7f73143c52089764d1e7c..15db24fa951e5ae96dceae9b07eb260fc9188cf0 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,4 +7,6 @@ TESTS = \
 EXTRA_DIST = testlib.sh
 
 clean-local:
+       -for pid in *.test.?/pid; do ../src/tinc --pidfile="$$pid" stop; done
+       -killall ../src/sptps_test
        -rm -rf *.test.?

diff --git a/test/testlib.sh b/test/testlib.sh
index d60b9da5b37e6f6cd4c08f99b6b5e02bf2e5f490..39a2bf4e14468cb7f60b563dfea32957f2c557d7 100644 (file)
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -21,10 +21,6 @@ case "$_" in
        ;;
 esac
 
-# Remove test directories
-
-rm -rf $d1 $d2 $d3
-
 # Default arguments for both tinc and tincd
 
 c1="--config=$d1 --pidfile=$d1/pid"
@@ -37,6 +33,16 @@ r1="--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
 
 set -ex