Attachment 144358 Details for Bug 191574 – Proposed fixes

[patch] Proposed fixes

get-zfs-testcases-to-run-on-CURRENT.patch (text/plain), 2.17 KB, created by Enji Cooper on 2014-07-02 23:44:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2014-07-02 23:44:17 UTC

Size: 2.17 KB

patch

obsolete

>diff --git a/tools/regression/zfs/misc.sh b/tools/regression/zfs/misc.sh
>index d96aa22..8445191 100755
>--- a/tools/regression/zfs/misc.sh
>+++ b/tools/regression/zfs/misc.sh
>@@ -39,6 +39,7 @@ fi
> die()
> {
> 	echo "${1}" > /dev/stderr
>+	echo "Bail out!"
> 	exit 1
> }
> 
>@@ -134,7 +135,7 @@ setup_tmpfs()
> 	cmd="mktemp -d /tmp/zfs-regression.XXXXXXXXXX"
> 	TMPDIR=`${cmd}` || die "failed: ${cmd}"
> 	cmd="mount -t tmpfs none ${TMPDIR}"
>-	${cmd} || die "failed: ${cmd}"
>+	sh -c "${cmd}" || die "failed: ${cmd}"
> }
> 
> # Clean up the tmpfs directory (Linux only)
>@@ -142,7 +143,7 @@ cleanup_tmpfs()
> {
> 	if [ -n "${TMPDIR}" ]; then
> 		cmd="umount ${TMPDIR} && rmdir ${TMPDIR}"
>-		eval "${cmd}" || die "failed: ${cmd}"
>+		sh -c "$cmd" || die "failed: ${cmd}"
> 	fi
> }
> 
>@@ -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=$(sh -c "$cmd" 2>/dev/null) || die "failed: ${cmd}"
> 		if [ -n "${devname}" ]; then
> 			DISKNAME="${devname}"
> 		fi
>@@ -201,11 +202,11 @@ create_memdisk()
> 		if [ -n "${devname}" ]; then
> 			devname=`echo ${devname} | cut -c 9-`
> 			cmd="losetup /dev/${devname} ${fname} 2>&1"
>-			eval ${cmd} || die "failed: ${cmd}"
>+			${cmd} || die "failed: ${cmd}"
> 			DISKNAME="${devname}"
> 		else
> 			cmd="losetup -s -f ${fname} 2>&1"
>-			diskname=`eval ${cmd}`
>+			diskname=`${cmd}`
> 
> 			if [ "${diskname}" = "losetup: could not find any free loop device" ]; then
> 				# If there are no free loopback devices, create one more
>@@ -250,7 +251,7 @@ destroy_memdisk()
> 		disk=`echo ${disk} | cut -c 9-`
> 
> 		cmd="losetup /dev/${disk} | awk '{print substr(\$3, 2, length(\$3)-2)}'"
>-		fname=`eval ${cmd}` || die "failed: ${cmd}"
>+		fname=`${cmd}` || die "failed: ${cmd}"
> 
> 		cmd="losetup -d /dev/${disk}"
> 		${cmd} || die "failed: ${cmd}"
>@@ -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()

Actions: View | Diff

Attachments on bug 191574: 144358