- 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
This commit is contained in:
parent
a5570ae0d7
commit
59dee1b08b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273627
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user