PID file support hasn't been committed for ggated(8) yet. Unbreak running

the testcase more than once by restoring the "killall ggated"

MFC after: 15 days
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-01-14 07:39:05 +00:00
parent 3196923796
commit 0713024269
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=293880

View File

@ -11,7 +11,6 @@ while [ -c /dev/ggate${us} ]; do
: $(( us += 1 )) : $(( us += 1 ))
done done
conf=`mktemp $base.XXXXXX` || exit 1 conf=`mktemp $base.XXXXXX` || exit 1
pidfile=/var/run/ggated.pid
port=33080 port=33080
work=$(attach_md -t malloc -s 1M) work=$(attach_md -t malloc -s 1M)
@ -20,7 +19,7 @@ src=$(attach_md -t malloc -s 1M)
test_cleanup() test_cleanup()
{ {
ggatec destroy -f -u $us ggatec destroy -f -u $us
pkill -F $pidfile killall ggated
geom_test_cleanup geom_test_cleanup
} }
trap test_cleanup ABRT EXIT INT TERM trap test_cleanup ABRT EXIT INT TERM