From owner-svn-src-user@freebsd.org  Mon May 29 08:51: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 D0753CF4AE9
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 29 May 2017 08:51: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 9FF03711CD;
 Mon, 29 May 2017 08:51: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 v4T8pOuM092005;
 Mon, 29 May 2017 08:51:24 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T8pOEi092004;
 Mon, 29 May 2017 08:51:24 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705290851.v4T8pOEi092004@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: Mon, 29 May 2017 08:51:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r319108 - 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: Mon, 29 May 2017 08:51:25 -0000

Author: pho
Date: Mon May 29 08:51:24 2017
New Revision: 319108
URL: https://svnweb.freebsd.org/changeset/base/319108

Log:
  Do not flag a missing libmicro-bench as an error.
  Added cleanup.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/libMicro.sh
==============================================================================
--- user/pho/stress2/misc/libMicro.sh	Mon May 29 08:49:03 2017	(r319107)
+++ user/pho/stress2/misc/libMicro.sh	Mon May 29 08:51:24 2017	(r319108)
@@ -37,12 +37,13 @@ if [ $# -eq 0 ]; then
 	[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 	[ -x /usr/local/bin/libmicro-bench ] ||
-	    { echo "ports/benchmarks/libmicro is not installed"; exit 1; }
+	    { echo "ports/benchmarks/libmicro is not installed"; exit 0; }
 
 	[ `id -un` = $testuser ] &&
 	    { echo "\$testuser is identical to current id"; exit 1; }
 
 	rm -f /tmp/libmicro.log
+	trap "rm -rf /var/tmp/libmicro.[0-9]*" 0
 	su $testuser -c "$0 x"
 	echo ""
 else
@@ -50,4 +51,5 @@ else
 	# Temp. work-around for hanging "c_lockf_10" test.
 	sleep 60
 	kill 0
+	wait
 fi