From owner-svn-src-all@freebsd.org  Mon Feb  1 06:28:00 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6237A91108;
 Mon,  1 Feb 2016 06:28:00 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E6A71F47;
 Mon,  1 Feb 2016 06:28:00 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u116RxDZ064020;
 Mon, 1 Feb 2016 06:27:59 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u116RxId064019;
 Mon, 1 Feb 2016 06:27:59 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602010627.u116RxId064019@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 1 Feb 2016 06:27:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295117 - head/tests/sys/geom/class/gate
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2016 06:28:00 -0000

Author: ngie
Date: Mon Feb  1 06:27:59 2016
New Revision: 295117
URL: https://svnweb.freebsd.org/changeset/base/295117

Log:
  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

Modified:
  head/tests/sys/geom/class/gate/1_test.sh

Modified: head/tests/sys/geom/class/gate/1_test.sh
==============================================================================
--- head/tests/sys/geom/class/gate/1_test.sh	Mon Feb  1 06:25:16 2016	(r295116)
+++ head/tests/sys/geom/class/gate/1_test.sh	Mon Feb  1 06:27:59 2016	(r295117)
@@ -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