From owner-svn-src-user@FreeBSD.ORG  Wed Jul 17 06:11:44 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B270974B;
 Wed, 17 Jul 2013 06:11:44 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A624B7F5;
 Wed, 17 Jul 2013 06:11:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6H6BiIf062857;
 Wed, 17 Jul 2013 06:11:44 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6H6Bidc062855;
 Wed, 17 Jul 2013 06:11:44 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307170611.r6H6Bidc062855@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 17 Jul 2013 06:11:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253409 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jul 2013 06:11:44 -0000

Author: pho
Date: Wed Jul 17 06:11:43 2013
New Revision: 253409
URL: http://svnweb.freebsd.org/changeset/base/253409

Log:
  Added a fail safe test termination method.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/tcp.sh
  user/pho/stress2/misc/tcp2.sh

Modified: user/pho/stress2/misc/tcp.sh
==============================================================================
--- user/pho/stress2/misc/tcp.sh	Wed Jul 17 04:53:53 2013	(r253408)
+++ user/pho/stress2/misc/tcp.sh	Wed Jul 17 06:11:43 2013	(r253409)
@@ -44,6 +44,10 @@ n=`su $testuser -c "limits | grep maxpro
 export tcpINCARNATIONS=$((n / 2 - 10))
 export TESTPROGS=" ./testcases/tcp/tcp"
 
-su $testuser -c '(cd ..; ./testcases/run/run $TESTPROGS)'
+su $testuser -c '(cd ..; ./testcases/run/run $TESTPROGS)' &
 
-ps -U$testuser | sed 1d | awk '{print $1}' | xargs kill -9
+sleep $((15 * 60))
+while pkill -9 -U $testuser tcp; do
+	sleep .5
+done
+wait

Modified: user/pho/stress2/misc/tcp2.sh
==============================================================================
--- user/pho/stress2/misc/tcp2.sh	Wed Jul 17 04:53:53 2013	(r253408)
+++ user/pho/stress2/misc/tcp2.sh	Wed Jul 17 06:11:43 2013	(r253409)
@@ -48,6 +48,10 @@ export TESTPROGS="
 ./testcases/swap/swap
 "
 
-su $testuser -c '(cd ..; ./testcases/run/run $TESTPROGS)'
+su $testuser -c '(cd ..; ./testcases/run/run $TESTPROGS)' &
 
-ps -U$testuser | sed 1d | awk '{print $1}' | xargs kill -9
+sleep $((15 * 60))
+while pkill -9 -U $testuser "tcp|swap"; do
+	sleep .5
+done
+wait