Message ID | 1420055304-4633-1-git-send-email-anand.jain@oracle.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On Wed, Dec 31, 2014 at 7:48 PM, Anand Jain <anand.jain@oracle.com> wrote: > The subvol delete output has changed with btrfs-progs > -Delete subvolume 'SCRATCH_MNT/snap' > +Delete subvolume (no-commit): 'SCRATCH_MNT/snap' > > make the matching changes in the xfstests btrfs 001.out Hi Anand, This is a wrong approach to fix it. With this change it means the test will now fail with a btrfs-progs release older than v3.18... The test should just ignore the output and check if the snapshot creation command succeeds. See how more recent tests do it - they are calling _run_btrfs_util_prog (which calls run_check). thanks > > Signed-off-by: Anand Jain <anand.jain@oracle.com> > --- > tests/btrfs/001.out | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out > index c782bde..8dc6eac 100644 > --- a/tests/btrfs/001.out > +++ b/tests/btrfs/001.out > @@ -33,7 +33,7 @@ subvol > Listing subvolumes > snap > subvol > -Delete subvolume 'SCRATCH_MNT/snap' > +Delete subvolume (no-commit): 'SCRATCH_MNT/snap' > List root dir > subvol > List root dir > -- > 2.0.0.153.g79dcccc > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > The test should just ignore the output and check if the snapshot > creation command succeeds. > See how more recent tests do it - they are calling > _run_btrfs_util_prog (which calls run_check). How nice we have _run_btrfs_util_prog. it was needed for a long time Thanks, v2 is out. Anand -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out index c782bde..8dc6eac 100644 --- a/tests/btrfs/001.out +++ b/tests/btrfs/001.out @@ -33,7 +33,7 @@ subvol Listing subvolumes snap subvol -Delete subvolume 'SCRATCH_MNT/snap' +Delete subvolume (no-commit): 'SCRATCH_MNT/snap' List root dir subvol List root dir
The subvol delete output has changed with btrfs-progs -Delete subvolume 'SCRATCH_MNT/snap' +Delete subvolume (no-commit): 'SCRATCH_MNT/snap' make the matching changes in the xfstests btrfs 001.out Signed-off-by: Anand Jain <anand.jain@oracle.com> --- tests/btrfs/001.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)