From owner-svn-src-stable-10@freebsd.org  Tue Dec 29 01:08:09 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 3ADFEA4B999;
 Tue, 29 Dec 2015 01:08:09 +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 08FBE1A6A;
 Tue, 29 Dec 2015 01:08:08 +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 tBT188k7016601;
 Tue, 29 Dec 2015 01:08:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBT188n0016600;
 Tue, 29 Dec 2015 01:08:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512290108.tBT188n0016600@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: Tue, 29 Dec 2015 01:08:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292854 - stable/10/tests/sys/file
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Dec 2015 01:08:09 -0000

Author: ngie
Date: Tue Dec 29 01:08:07 2015
New Revision: 292854
URL: https://svnweb.freebsd.org/changeset/base/292854

Log:
  MFC r292582:
  
  Dump out the output from flock_helper on failure so failures with the
  test app can be debugged
  
  Obtained from: Isilon OneFS (^/onefs/head@r511419)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/tests/sys/file/flock_test.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/file/flock_test.sh
==============================================================================
--- stable/10/tests/sys/file/flock_test.sh	Tue Dec 29 01:07:00 2015	(r292853)
+++ stable/10/tests/sys/file/flock_test.sh	Tue Dec 29 01:08:07 2015	(r292854)
@@ -48,10 +48,11 @@ for n in `seq 1 $last_testcase`; do
 		todomsg=" # TODO: racy testcase (doesn't handle EINTR properly)"
 	fi
 
-	$(dirname $0)/flock_helper . $n | grep -q SUCCEED
-	if [ $? -eq 0 ]; then
+	output=$($(dirname $0)/flock_helper . $n)
+	if echo "$output" | grep -q SUCCEED; then
 		echo "ok $n$todomsg"
 	else
 		echo "not ok $n$todomsg"
+		echo "$output" >&2
 	fi
 done