Replace ISAINFO with is_32bit function
The isainfo(1) utility was used by the ZFS Test Suite to determine when running on a 32-bit platform. This non-portable check has been replaced with an is_32bit helper function which uses getconf(1). The getconf(1) utility is available for Linux, FreeBSD, and Illumos. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
1ad9de6d08
commit
61f9b2cd12
|
@ -144,7 +144,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_BSD], [
|
|||
AC_PATH_TOOL(DUMPADM, dumpadm, "")
|
||||
AC_PATH_TOOL(FORMAT, format, "")
|
||||
AC_PATH_TOOL(GETMAJOR, getmajor, "")
|
||||
AC_PATH_TOOL(ISAINFO, isainfo, "")
|
||||
AC_PATH_TOOL(KSTAT, kstat, "")
|
||||
AC_PATH_TOOL(LOCKFS, lockfs, "")
|
||||
AC_PATH_TOOL(LOFIADM, lofiadm, "")
|
||||
|
|
|
@ -48,7 +48,6 @@ export HEAD="@HEAD@"
|
|||
export HOSTNAME="@HOSTNAME@"
|
||||
export ID="@ID@"
|
||||
export IOSTAT="@IOSTAT@"
|
||||
export ISAINFO="@ISAINFO@"
|
||||
export KILL="@KILL@"
|
||||
export KSH="@KSH@"
|
||||
export KSTAT="@KSTAT@"
|
||||
|
|
|
@ -73,7 +73,7 @@ if is_global_zone ; then
|
|||
log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
|
||||
|
||||
# Max volume size is 1TB on 32-bit systems
|
||||
[[ $($ISAINFO -b) == 32 ]] && \
|
||||
[[ is_32bit ]] && \
|
||||
BIGVOLSIZE=1Tb
|
||||
log_must $ZFS create -sV $BIGVOLSIZE $TESTPOOL/$TESTVOL1
|
||||
fi
|
||||
|
|
|
@ -126,7 +126,7 @@ for volsize in $VOLSIZES; do
|
|||
str=$($ZFS create -sV $volsize $TESTPOOL2/$TESTVOL 2>&1)
|
||||
ret=$?
|
||||
if (( ret != 0 )); then
|
||||
if [[ $($ISAINFO -b) == 32 && \
|
||||
if [[ is_32bit && \
|
||||
$str == *${VOL_LIMIT_KEYWORD1}* || \
|
||||
$str == *${VOL_LIMIT_KEYWORD2}* || \
|
||||
$str == *${VOL_LIMIT_KEYWORD3}* ]]
|
||||
|
|
Loading…
Reference in New Issue