Move args around to suit freebsd getopt

Signed-off-by: Paul Dagnelie <pcd@delphix.com>
pcd1193182 · Oct 11, 2024 · d13fe48 · d13fe48
1 parent 99e7dac
commit d13fe48
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_001_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_001_pos.ksh
@@ -41,8 +41,8 @@ verify_runnable "global"
 log_assert "Creating a pool with a shared log succeeds."
 log_onexit cleanup
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
+log_must zpool create -L -f $LOGPOOL "$DISK0"
+log_must zpool create -l $LOGPOOL -f $TESTPOOL "$DISK1"
 log_must verify_shared_log $TESTPOOL $LOGPOOL
 verify_pool $LOGPOOL
 verify_pool $TESTPOOL

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_002_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_002_pos.ksh
@@ -45,8 +45,8 @@ log_onexit cleanup
 
 typeset FS="$TESTPOOL/fs"
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1"
 log_must verify_shared_log $TESTPOOL $LOGPOOL
 log_must zfs create -o sync=always -o recordsize=8k $FS
 

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_003_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_003_pos.ksh
@@ -46,8 +46,8 @@ log_onexit cleanup
 
 typeset FS="$TESTPOOL/fs"
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1"
 log_must verify_shared_log $TESTPOOL $LOGPOOL
 log_must zfs create -o sync=always -o recordsize=8k $FS
 mntpnt=$(get_prop mountpoint $FS)

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_004_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_004_pos.ksh
@@ -46,9 +46,9 @@ log_onexit cleanup
 
 typeset FS="$TESTPOOL/fs"
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool ${LOGPOOL}2 -L "$DISK1"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK2"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_must zpool create -f -L ${LOGPOOL}2 "$DISK1"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK2"
 log_must verify_shared_log $TESTPOOL $LOGPOOL
 log_must zfs create -o sync=always -o recordsize=8k $FS
 mntpnt=$(get_prop mountpoint $FS)

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_005_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_005_pos.ksh
@@ -43,8 +43,8 @@ log_onexit cleanup
 
 typeset FS="$TESTPOOL/fs"
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1"
 log_must verify_shared_log $TESTPOOL $LOGPOOL
 log_must zfs create -o sync=always -o recordsize=8k $FS
 mntpnt=$(get_prop mountpoint $FS)

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_006_neg.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_006_neg.ksh
@@ -46,26 +46,26 @@ verify_runnable "global"
 log_assert "Negative shared log testing."
 log_onexit cleanup
 
-log_mustnot create_pool $TESTPOOL -l $LOGPOOL "$DISK0"
+log_mustnot zpool create -f -l $LOGPOOL $TESTPOOL "$DISK0"
 
-log_must create_pool $TESTPOOL2 "$DISK2"
-log_mustnot create_pool $TESTPOOL -l $TESTPOOL2 "$DISK0"
+log_must zpool create -f $TESTPOOL2 "$DISK2"
+log_mustnot zpool create -l $TESTPOOL2 -f $TESTPOOL "$DISK0"
 log_must zpool destroy $TESTPOOL2
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_mustnot create_pool $TESTPOOL -l "${LOGPOOL}2" "$DISK1" 
-log_mustnot create_pool $TESTPOOL -l $LOGPOOL "$DISK1" log "$DISK2"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_mustnot zpool create -f -l "${LOGPOOL}2" $TESTPOOL "$DISK1" 
+log_mustnot zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1" log "$DISK2"
 
-log_must create_pool ${LOGPOOL}2 -L "$DISK1"
+log_must zpool create -f -L ${LOGPOOL}2 "$DISK1"
 log_must zpool destroy ${LOGPOOL}2
 
 typeset FS="$LOGPOOL/fs"
 log_mustnot zfs create -o sync=always -o recordsize=8k $FS
 
-log_mustnot create_pool $TESTPOOL -l $LOGPOOL -o feature@shared_log=disabled "$DISK1"
-log_mustnot create_pool ${LOGPOOL}2 -L -o feature@shared_log=disabled "$DISK1"
+log_mustnot zpool create -f -l $LOGPOOL -o feature@shared_log=disabled $TESTPOOL "$DISK1"
+log_mustnot zpool create -f -L -o feature@shared_log=disabled ${LOGPOOL}2 "$DISK1"
 
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1"
 log_mustnot zpool export $LOGPOOL
 log_mustnot zpool destroy $LOGPOOL
 

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_007_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_007_pos.ksh
@@ -43,8 +43,8 @@ log_onexit cleanup
 
 typeset FS="$TESTPOOL/fs"
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1"
 log_must zinject -d "$DISK0" -A degrade $LOGPOOL
 log_must eval "zpool status -e $TESTPOOL | grep DEGRADED"
 

diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log_008_pos.ksh b/tests/zfs-tests/tests/functional/shared_log/shared_log_008_pos.ksh
@@ -48,9 +48,9 @@ log_onexit cleanup
 
 typeset FS="$TESTPOOL/fs"
 
-log_must create_pool $LOGPOOL -L "$DISK0"
-log_must create_pool $TESTPOOL -l $LOGPOOL "$DISK1"
-log_must create_pool ${TESTPOOL}2 -l $LOGPOOL "$DISK2"
+log_must zpool create -f -L $LOGPOOL "$DISK0"
+log_must zpool create -f -l $LOGPOOL $TESTPOOL "$DISK1"
+log_must zpool create -f -l $LOGPOOL ${TESTPOOL}2 "$DISK2"
 log_must zfs create -o sync=always ${TESTPOOL}/fs
 log_must zfs create -o sync=always ${TESTPOOL}2/fs
 log_must dd if=/dev/urandom of=/${TESTPOOL}/fs/f1 bs=128k count=128