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>

@@ -24,30 +24,30 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/zvol/zvol_common.shlib
 . $STF_SUITE/tests/functional/zvol/zvol_swap/zvol_swap.cfg
 
 verify_runnable "global"
 
-log_must $SWAPADD
+log_must swapadd
 for swapdev in $SAVESWAPDEVS
 do
         if ! is_swap_inuse $swapdev ; then
-                log_must $SWAP -a $swapdev >/dev/null 2>&1
+                log_must swap -a $swapdev >/dev/null 2>&1
         fi
 done
 
 voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL
 if is_swap_inuse $voldev ; then
-        log_must $SWAP -d $voldev
+        log_must swap -d $voldev
 fi
 
 default_zvol_cleanup
 
 log_pass