diff options
| author | ngie <ngie@FreeBSD.org> | 2016-02-01 06:27:59 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-02-01 06:27:59 +0000 |
| commit | 6bfd44302722ea2bb067ec956966c4ae3a6fb615 (patch) | |
| tree | a390938affd292796af3233be161b8a97bdcec9b /tests | |
| parent | 45e2a376b1471c34b1b1cf6baca356b4d8018588 (diff) | |
| download | FreeBSD-src-6bfd44302722ea2bb067ec956966c4ae3a6fb615.zip FreeBSD-src-6bfd44302722ea2bb067ec956966c4ae3a6fb615.tar.gz | |
Use the pidfile support added to ggated(8) in r294973 to ensure that the
ggated(8) daemon used by the tests is the instance specifically invoked by
the tests instead of one or more daemon instances running on the system
MFC after: 1 month
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/geom/class/gate/1_test.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/sys/geom/class/gate/1_test.sh b/tests/sys/geom/class/gate/1_test.sh index 9b2cf69..ba573bb 100644 --- a/tests/sys/geom/class/gate/1_test.sh +++ b/tests/sys/geom/class/gate/1_test.sh @@ -10,6 +10,7 @@ us=0 while [ -c /dev/ggate${us} ]; do : $(( us += 1 )) done +pidfile=ggated.$$.pid conf=`mktemp $base.XXXXXX` || exit 1 port=33080 @@ -19,7 +20,7 @@ src=$(attach_md -t malloc -s 1M) test_cleanup() { ggatec destroy -f -u $us - killall ggated + pkill -F $pidfile geom_test_cleanup } trap test_cleanup ABRT EXIT INT TERM @@ -30,7 +31,7 @@ src_checksum=$(md5 -q /dev/$src) echo "127.0.0.1 RW /dev/$work" > $conf -if ! ggated -p $port $conf; then +if ! ggated -p $port -F $pidfile $conf; then echo 'ggated failed to start' echo 'Bail out!' exit 1 |
