svn commit: r273627 - head/tools/regression/zfs

[Garrett Cooper]

Author: ngie
Date: Sat Oct 25 04:52:48 2014
New Revision: 273627
URL: https://svnweb.freebsd.org/changeset/base/273627

Log:
  - 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
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/regression/zfs/misc.sh

Modified: head/tools/regression/zfs/misc.sh
==============================================================================
--- head/tools/regression/zfs/misc.sh	Sat Oct 25 02:08:02 2014	(r273626)
+++ head/tools/regression/zfs/misc.sh	Sat Oct 25 04:52:48 2014	(r273627)
@@ -39,6 +39,7 @@ fi
 die()
 {
 	echo "${1}" > /dev/stderr
+	echo "Bail out!"
 	exit 1
 }
 
@@ -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()