Date: Sat, 25 Oct 2014 04:52:49 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273627 - head/tools/regression/zfs Message-ID: <201410250452.s9P4qniG069046@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410250452.s9P4qniG069046>