From owner-svn-src-user@freebsd.org  Wed Mar 15 10:30:25 2017
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 F31C0D0D563
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed, 15 Mar 2017 10:30:25 +0000 (UTC) (envelope-from pho@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 C0A511D54;
 Wed, 15 Mar 2017 10:30:25 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2FAUOBH075766;
 Wed, 15 Mar 2017 10:30:24 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2FAUOwh075765;
 Wed, 15 Mar 2017 10:30:24 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201703151030.v2FAUOwh075765@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 15 Mar 2017 10:30:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r315296 - 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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Mar 2017 10:30:26 -0000

Author: pho
Date: Wed Mar 15 10:30:24 2017
New Revision: 315296
URL: https://svnweb.freebsd.org/changeset/base/315296

Log:
  Limit runtime, rename test program to a unique name and do not loop forever
  on umount.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/fts.sh

Modified: user/pho/stress2/misc/fts.sh
==============================================================================
--- user/pho/stress2/misc/fts.sh	Wed Mar 15 10:24:35 2017	(r315295)
+++ user/pho/stress2/misc/fts.sh	Wed Mar 15 10:30:24 2017	(r315296)
@@ -37,9 +37,9 @@
 
 here=`pwd`
 cd /tmp
-sed '1,/^EOF/d' < $here/$0 > fts.c
-mycc -o fts -Wall -Wextra fts.c
-rm -f fts.c
+sed '1,/^EOF/d' < $here/$0 > fts1.c
+mycc -o fts1 -Wall -Wextra fts1.c || exit 1
+rm -f fts1.c
 cd $here
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
@@ -53,23 +53,25 @@ newfs $newfs_flags md${mdstart}$part > /
 mount /dev/md${mdstart}$part $mntpoint
 chmod 777 $mntpoint
 
-export runRUNTIME=30m
+export runRUNTIME=20m
 export RUNDIR=$mntpoint/stressX
 
 su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null &
 pid=$!
 while kill -0 $pid 2> /dev/null; do
-	/tmp/fts $mntpoint
+	/tmp/fts1 $mntpoint
 	sleep 1
 done
 wait
 
-while mount | grep $mntpoint | grep -q /dev/md; do
-	umount $mntpoint || sleep 1
+s=0
+for i in `jot 6`; do
+	umount $mntpoint && break || sleep 10
 done
+[ $i -eq 6 ] && s=1
 mdconfig -d -u $mdstart
-rm -f /tmp/fts
-exit
+rm -f /tmp/fts1
+exit $s
 EOF
 #include <sys/param.h>
 #include <err.h>