From owner-svn-src-all@FreeBSD.ORG  Sat Nov 15 05:16:16 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C594B1AA;
 Sat, 15 Nov 2014 05:16:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 B1802829;
 Sat, 15 Nov 2014 05:16:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAF5GG3b085577;
 Sat, 15 Nov 2014 05:16:16 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAF5GGAN085576;
 Sat, 15 Nov 2014 05:16:16 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411150516.sAF5GGAN085576@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 15 Nov 2014 05:16:16 +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: r274543 - stable/10/tools/regression/zfs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Nov 2014 05:16:16 -0000

Author: ngie
Date: Sat Nov 15 05:16:16 2014
New Revision: 274543
URL: https://svnweb.freebsd.org/changeset/base/274543

Log:
  MFC r273627,r273628:
  
  r273627:
  
    - Print out "Bail out!" in die(..) so prove terminates immediately
    - Handle the output from newer versions of openssl md5, similar to what
      pjd@ did in r248304
  
    Sponsored by: EMC / Isilon Storage Division
  
  r273628:
  
    Move the redirection to stderr out of the cmd variable assignment
  
    Putting 2>/dev/null in cmd= escapes the redirection operation, which causes
    mdconfig to think it's a filename
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/tools/regression/zfs/misc.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tools/regression/zfs/misc.sh
==============================================================================
--- stable/10/tools/regression/zfs/misc.sh	Sat Nov 15 05:12:30 2014	(r274542)
+++ stable/10/tools/regression/zfs/misc.sh	Sat Nov 15 05:16:16 2014	(r274543)
@@ -39,6 +39,7 @@ fi
 die()
 {
 	echo "${1}" > /dev/stderr
+	echo "Bail out!"
 	exit 1
 }
 
@@ -166,8 +167,8 @@ create_memdisk()
 		if [ -n "${devname}" ]; then
 			devparam="-u ${devname}"
 		fi
-		cmd="mdconfig -a -t swap -s ${size} ${devparam} 2>/dev/null"
-		DISKNAME=`${cmd}` || die "failed: ${cmd}"
+		cmd="mdconfig -a -t swap -s ${size} ${devparam}"
+		DISKNAME=`$cmd 2>/dev/null` || die "failed: ${cmd}"
 		if [ -n "${devname}" ]; then
 			DISKNAME="${devname}"
 		fi
@@ -363,7 +364,7 @@ files_destroy()
 
 name_create()
 {
-	echo "zfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | cut -b -8`"
+	echo "zfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | awk '{ print $NF }'`"
 }
 
 names_create()