Skip to content

Commit

Permalink
Move args around to suit freebsd getopt
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Dagnelie <[email protected]>
  • Loading branch information
pcd1193182 committed Oct 11, 2024
1 parent 99e7dac commit d13fe48
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions tests/zfs-tests/tests/functional/shared_log/shared_log_006_neg.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d13fe48

Please sign in to comment.