From 61f9b2cd12a34dcc98e1c94d2988d561ff847b7b Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 4 Nov 2016 21:10:17 +0000
Subject: 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>
---
 config/user-commands.m4                                                 | 1 -
 tests/zfs-tests/include/commands.cfg.in                                 | 1 -
 .../tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh       | 2 +-
 tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh  | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/user-commands.m4 b/config/user-commands.m4
index d53bec4ff..b40606c3c 100644
--- a/config/user-commands.m4
+++ b/config/user-commands.m4
@@ -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, "")
diff --git a/tests/zfs-tests/include/commands.cfg.in b/tests/zfs-tests/include/commands.cfg.in
index e7fb5ff13..c8733e970 100644
--- a/tests/zfs-tests/include/commands.cfg.in
+++ b/tests/zfs-tests/include/commands.cfg.in
@@ -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@"
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
index 5e27ce10f..9c4e67e62 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
@@ -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
diff --git a/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh b/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
index 8ca4d9dd7..14765b8db 100755
--- a/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
@@ -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}* ]]
-- 
cgit v1.2.3