diff options
| author | David Sterba <dsterba@suse.com> | 2017-03-30 17:20:18 +0200 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2017-03-31 13:09:16 +0800 |
| commit | df8c7225ba003db61304d38722704666742fda10 (patch) | |
| tree | 4650a98991edc9bebad46350aabc2598e3f8e71e /tests/btrfs/137 | |
| parent | 5d36d8585afc3c56f99d88065e7f8aa315f27186 (diff) | |
btrfs: reorder arguments so that options come first
The option parser in the btrfs utility is going to be updated and
will accept arguments in a stricter form, namely that options must
come before their non-option argument. Otherwise eg. the -f option
in send would be understood as another path and not an option
leading to many test failures.
The canonical form should be:
btrfs command subcommand [-options] [arguments]
Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
Diffstat (limited to 'tests/btrfs/137')
| -rwxr-xr-x | tests/btrfs/137 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/btrfs/137 b/tests/btrfs/137 index 3ff2c6b4..eaac5d49 100755 --- a/tests/btrfs/137 +++ b/tests/btrfs/137 @@ -103,10 +103,10 @@ $XFS_IO_PROG -r -c "fiemap -v" $SCRATCH_MNT/snap2/bar | _filter_fiemap echo # Create the send streams to apply later on a new filesystem. -$BTRFS_UTIL_PROG send $SCRATCH_MNT/snap1 -f $send_files_dir/1.snap 2>&1 \ +$BTRFS_UTIL_PROG send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 2>&1 \ | _filter_scratch -$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2 \ - -f $send_files_dir/2.snap 2>&1 | _filter_scratch +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ + $SCRATCH_MNT/snap2 2>&1 | _filter_scratch # Create a new filesystem, receive the send streams and verify that the file # contents are the same as in the original filesystem and that the file holes @@ -114,8 +114,8 @@ $BTRFS_UTIL_PROG send -p $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2 \ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap >/dev/null -$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap >/dev/null +$BTRFS_UTIL_PROG receive -f $send_files_dir/1.snap $SCRATCH_MNT >/dev/null +$BTRFS_UTIL_PROG receive -f $send_files_dir/2.snap $SCRATCH_MNT >/dev/null echo echo "File digests in the new filesystem:" |