From 985cf6522a5d4a1e1843ff7fb6ba787032c1f630 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 29 Dec 2015 01:08:07 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@292854 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 tests/sys/file/flock_test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/sys/file/flock_test.sh b/tests/sys/file/flock_test.sh
index ac3e79957..ffd3d1861 100755
--- a/tests/sys/file/flock_test.sh
+++ b/tests/sys/file/flock_test.sh
@@ -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
-- 
2.45.0