diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-05-08 14:17:29 -0700 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-05-08 14:17:29 -0700 |
commit | d00c9550da1801a0eaff5cedf4312e24691b31ea (patch) | |
tree | 3881ca1764ef792259e1b70f12c884a3ac0c0715 /tests/misc-tests/021-image-multi-devices | |
parent | dab6d2181f1f194ec3a76d900cf2c6533379cbea (diff) |
New upstream release.
Diffstat (limited to 'tests/misc-tests/021-image-multi-devices')
-rwxr-xr-x | tests/misc-tests/021-image-multi-devices/test.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/misc-tests/021-image-multi-devices/test.sh b/tests/misc-tests/021-image-multi-devices/test.sh index d78c44fb..5430847f 100755 --- a/tests/misc-tests/021-image-multi-devices/test.sh +++ b/tests/misc-tests/021-image-multi-devices/test.sh @@ -20,31 +20,31 @@ loop2=$(run_check_stdout $SUDO_HELPER losetup --find --show dev2) # Create the test file system. -run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f $loop1 $loop2 -run_check $SUDO_HELPER mount $loop1 "$TEST_MNT" -run_check $SUDO_HELPER dd bs=1M count=1 if=/dev/zero "of=$TEST_MNT/foobar" +run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$loop1" "$loop2" +run_check $SUDO_HELPER mount "$loop1" "$TEST_MNT" +run_check $SUDO_HELPER dd bs=1M count=1 if=/dev/zero of="$TEST_MNT/foobar" orig_md5=$(run_check_stdout md5sum "$TEST_MNT/foobar" | cut -d ' ' -f 1) run_check $SUDO_HELPER umount "$TEST_MNT" # Create the image to restore later. -run_check $SUDO_HELPER "$TOP/btrfs-image" $loop1 "$IMAGE" +run_check $SUDO_HELPER "$TOP/btrfs-image" "$loop1" "$IMAGE" # Wipe out the filesystem from the devices, restore the image on a single # device, check everything works and file foobar is there and with 1Mb of # zeroes. -run_check $SUDO_HELPER wipefs -a $loop1 -run_check $SUDO_HELPER wipefs -a $loop2 +run_check $SUDO_HELPER wipefs -a "$loop1" +run_check $SUDO_HELPER wipefs -a "$loop2" -run_check $SUDO_HELPER $TOP/btrfs-image -r "$IMAGE" $loop1 +run_check $SUDO_HELPER "$TOP/btrfs-image" -r "$IMAGE" "$loop1" -run_check $SUDO_HELPER mount $loop1 "$TEST_MNT" +run_check $SUDO_HELPER mount "$loop1" "$TEST_MNT" new_md5=$(run_check_stdout md5sum "$TEST_MNT/foobar" | cut -d ' ' -f 1) run_check $SUDO_HELPER umount "$TEST_MNT" # Cleanup loop devices. -run_check $SUDO_HELPER losetup -d $loop1 -run_check $SUDO_HELPER losetup -d $loop2 +run_check $SUDO_HELPER losetup -d "$loop1" +run_check $SUDO_HELPER losetup -d "$loop2" rm -f dev1 dev2 # Compare the file digests. -[ $orig_md5 == $new_md5 ] || _fail "File digests do not match" +[ "$orig_md5" == "$new_md5" ] || _fail "File digests do not match" |