Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: Avoid nonportable cmp flag 

FreeBSD doesn't have the -n flag for cmp.

Read the area for the first four labels from the disk to a separate
file to compare instead of using the special flag to limit the size.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10024
This commit is contained in:
Ryan Moeller 2020-02-19 12:03:31 -05:00 committed by GitHub
parent 89adffb7bc
commit 392556f0ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_valid.ksh
View File

@ -39,13 +39,15 @@ verify_runnable "global"
function cleanup function cleanup
{ {
poolexists $TESTPOOL && destroy_pool $TESTPOOL poolexists $TESTPOOL && destroy_pool $TESTPOOL
rm -f $PATTERN_FILE $DEVICE1 $DEVICE2 $DEVICE3 $DEVICE4 rm -f $PATTERN_FILE $DISK_PATTERN_FILE \
$DEVICE1 $DEVICE2 $DEVICE3 $DEVICE4
} }
log_onexit cleanup log_onexit cleanup
log_assert "zpool labelclear will only clear valid labels" log_assert "zpool labelclear will only clear valid labels"
PATTERN_FILE=$TEST_BASE_DIR/pattern PATTERN_FILE=$TEST_BASE_DIR/pattern
DISK_PATTERN_FILE=$TEST_BASE_DIR/disk-pattern
DEVICE1="$TEST_BASE_DIR/device-1" DEVICE1="$TEST_BASE_DIR/device-1"
DEVICE2="$TEST_BASE_DIR/device-2" DEVICE2="$TEST_BASE_DIR/device-2"
@ -79,7 +81,8 @@ log_mustnot eval "zpool import -d $TEST_BASE_DIR | grep $TESTPOOL"
# Verify the original pattern over the first two labels is intact # Verify the original pattern over the first two labels is intact
for dev in $DEVICE1 $DEVICE2 $DEVICE3 $DEVICE4; do for dev in $DEVICE1 $DEVICE2 $DEVICE3 $DEVICE4; do
log_must cmp -n $((4 * 1048576)) $dev $PATTERN_FILE log_must dd if=$dev of=$DISK_PATTERN_FILE bs=1048576 count=4
log_must cmp $DISK_PATTERN_FILE $PATTERN_FILE
log_mustnot zdb -lq $dev log_mustnot zdb -lq $dev
done done