stress2: Fix cleanup after test run

tools/test/stress2/misc/force4.sh

@@ -82,7 +82,7 @@ done
 sleep 1
 ../tools/killall.sh
 wait
-umount $mp2
+mount | grep -q "on $mp2 " && umount $mp2
 n=0
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1

tools/test/stress2/misc/syzkaller16.sh

@@ -410,7 +410,8 @@ mycc -o /tmp/syzkaller16 -Wall -Wextra -O0 -m32 /tmp/syzkaller16.c -pthread ||
 (cd ../testcases/swap; ./swap -t 1m -i 20 -h > /dev/null 2>&1) &
 (cd /tmp; ./syzkaller16) &
 sleep 60
-pkill -9 syzkaller16 swap
+pkill -9 syzkaller16
+while pkill swap; do sleep 1; done
 wait
 
 rm -f /tmp/syzkaller16 /tmp/syzkaller16.c /tmp/syzkaller16.core

tools/test/stress2/misc/syzkaller17.sh

@@ -124,7 +124,8 @@ while pgrep -q swap; do
 	(cd /tmp; timeout 1m ./syzkaller17)
 	[ $((`date +%s` - start)) -ge 60 ] && break
 done
-pkill -9 syzkaller17 swap
+pkill -9 syzkaller17
+while pkill swap; do sleep 1; done
 wait
 
 rm -f /tmp/syzkaller17 /tmp/syzkaller17.c /tmp/syzkaller17.core

tools/test/stress2/misc/syzkaller18.sh

@@ -121,7 +121,8 @@ while pgrep -q swap; do
 	(cd /tmp; timeout 1m ./syzkaller18)
 	[ $((`date +%s` - start)) -ge 60 ] && break
 done
-pkill -9 syzkaller18 swap
+pkill -9 syzkaller18
+while pkill swap; do sleep 1; done
 wait
 
 rm -f /tmp/syzkaller18 /tmp/syzkaller18.c /tmp/syzkaller18.core

tools/test/stress2/misc/syzkaller19.sh

@@ -164,7 +164,8 @@ mycc -o /tmp/syzkaller19 -Wall -Wextra -O2 /tmp/syzkaller19.c -lpthread ||
 (cd ../testcases/swap; ./swap -t 1m -i 20 -h > /dev/null 2>&1) &
 (cd /tmp; ./syzkaller19) &
 sleep 60
-pkill -9 syzkaller19 swap
+pkill -9 syzkaller19
+while pkill swap; do sleep 1; done
 wait
 
 rm -f /tmp/syzkaller19 /tmp/syzkaller19.c /tmp/syzkaller19.core