c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 18:34:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace ISAINFO with is_32bit function

Browse Source 
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:
Brian Behlendorf 2016-11-04 21:10:17 +00:00
parent 1ad9de6d08
commit 61f9b2cd12
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/user-commands.m4
View File

@ -144,7 +144,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_BSD], [
AC_PATH_TOOL(DUMPADM, dumpadm, "") AC_PATH_TOOL(DUMPADM, dumpadm, "")
AC_PATH_TOOL(FORMAT, format, "") AC_PATH_TOOL(FORMAT, format, "")
AC_PATH_TOOL(GETMAJOR, getmajor, "") AC_PATH_TOOL(GETMAJOR, getmajor, "")
AC_PATH_TOOL(ISAINFO, isainfo, "")
AC_PATH_TOOL(KSTAT, kstat, "") AC_PATH_TOOL(KSTAT, kstat, "")
AC_PATH_TOOL(LOCKFS, lockfs, "") AC_PATH_TOOL(LOCKFS, lockfs, "")
AC_PATH_TOOL(LOFIADM, lofiadm, "") AC_PATH_TOOL(LOFIADM, lofiadm, "")

1
tests/zfs-tests/include/commands.cfg.in
View File

@ -48,7 +48,6 @@ export HEAD="@HEAD@"
export HOSTNAME="@HOSTNAME@" export HOSTNAME="@HOSTNAME@"
export ID="@ID@" export ID="@ID@"
export IOSTAT="@IOSTAT@" export IOSTAT="@IOSTAT@"
export ISAINFO="@ISAINFO@"
export KILL="@KILL@" export KILL="@KILL@"
export KSH="@KSH@" export KSH="@KSH@"
export KSTAT="@KSTAT@" export KSTAT="@KSTAT@"

2
tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
View File

@ -73,7 +73,7 @@ if is_global_zone ; then
log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
# Max volume size is 1TB on 32-bit systems # Max volume size is 1TB on 32-bit systems
[[ $($ISAINFO -b) == 32 ]] && \ [[ is_32bit ]] && \
BIGVOLSIZE=1Tb BIGVOLSIZE=1Tb
log_must $ZFS create -sV $BIGVOLSIZE $TESTPOOL/$TESTVOL1 log_must $ZFS create -sV $BIGVOLSIZE $TESTPOOL/$TESTVOL1
fi fi

2
tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
View File

@ -126,7 +126,7 @@ for volsize in $VOLSIZES; do
str=$($ZFS create -sV $volsize $TESTPOOL2/$TESTVOL 2>&1) str=$($ZFS create -sV $volsize $TESTPOOL2/$TESTVOL 2>&1)
ret=$? ret=$?
if (( ret != 0 )); then if (( ret != 0 )); then
if [[ $($ISAINFO -b) == 32 && \ if [[ is_32bit && \
$str == *${VOL_LIMIT_KEYWORD1}* || \ $str == *${VOL_LIMIT_KEYWORD1}* || \
$str == *${VOL_LIMIT_KEYWORD2}* || \ $str == *${VOL_LIMIT_KEYWORD2}* || \
$str == *${VOL_LIMIT_KEYWORD3}* ]] $str == *${VOL_LIMIT_KEYWORD3}* ]]