Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 39,59 **** function zero_reservation { typeset resv_val dataset=$1 ! log_must $ZFS set reservation=none $dataset ! resv_val=`$ZFS get -H reservation $dataset | awk '{print $3}'` if [[ $? -ne 0 ]]; then log_fail "Unable to get reservation prop on $dataset" elif [[ $resv_val != "none" ]]; then log_fail "Reservation not 'none' ($resv_val) as expected" fi ! resv_val=`$ZFS get -pH reservation $dataset | awk '{print $3}'` if [[ $? -ne 0 ]]; then log_fail "Unable to get reservation prop on $dataset" elif [[ $resv_val -ne 0 ]]; then log_fail "Reservation not 0 ($resv_val) as expected" fi --- 39,59 ---- function zero_reservation { typeset resv_val dataset=$1 ! log_must zfs set reservation=none $dataset ! resv_val=`zfs get -H reservation $dataset | awk '{print $3}'` if [[ $? -ne 0 ]]; then log_fail "Unable to get reservation prop on $dataset" elif [[ $resv_val != "none" ]]; then log_fail "Reservation not 'none' ($resv_val) as expected" fi ! resv_val=`zfs get -pH reservation $dataset | awk '{print $3}'` if [[ $? -ne 0 ]]; then log_fail "Unable to get reservation prop on $dataset" elif [[ $resv_val -ne 0 ]]; then log_fail "Reservation not 0 ($resv_val) as expected" fi
*** 98,109 **** typeset -i count=$1 typeset FS_NAME=$2 typeset MNT_NAME=$3 while (($iter < $count)); do ! log_must $ZFS create ${FS_NAME}$iter ! log_must $ZFS set mountpoint=${MNT_NAME}$iter ${FS_NAME}$iter ((iter = iter + 1)) done } # --- 98,109 ---- typeset -i count=$1 typeset FS_NAME=$2 typeset MNT_NAME=$3 while (($iter < $count)); do ! log_must zfs create ${FS_NAME}$iter ! log_must zfs set mountpoint=${MNT_NAME}$iter ${FS_NAME}$iter ((iter = iter + 1)) done } #