| Message ID | 1414502171-10319-2-git-send-email-eguan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 28, 2014 at 09:16:08PM +0800, Eryu Guan wrote: > index 747cf72..8738da7 100644 > --- a/common/rc > +++ b/common/rc > @@ -558,7 +558,11 @@ _scratch_mkfs() > _scratch_mkfs_xfs $* > ;; > nfs*) > - # do nothing for nfs > + # unable to re-create NFS, just remove all files in $SCRATCH_MNT to > + # avoid EEXIST caused by the leftover files created in previous runs > + _scratch_mount > + rm -rf $SCRATCH_MNT/* > + _scratch_unmount Please move this into a helper, and wire it up for cifs as well. -- 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
On Tue, Oct 28, 2014 at 06:22:52AM -0700, Christoph Hellwig wrote: > On Tue, Oct 28, 2014 at 09:16:08PM +0800, Eryu Guan wrote: > > index 747cf72..8738da7 100644 > > --- a/common/rc > > +++ b/common/rc > > @@ -558,7 +558,11 @@ _scratch_mkfs() > > _scratch_mkfs_xfs $* > > ;; > > nfs*) > > - # do nothing for nfs > > + # unable to re-create NFS, just remove all files in $SCRATCH_MNT to > > + # avoid EEXIST caused by the leftover files created in previous runs > > + _scratch_mount > > + rm -rf $SCRATCH_MNT/* > > + _scratch_unmount > > Please move this into a helper, and wire it up for cifs as well. > Will do in v2. Thanks for the review! Eryu -- 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
diff --git a/common/rc b/common/rc index 747cf72..8738da7 100644 --- a/common/rc +++ b/common/rc @@ -558,7 +558,11 @@ _scratch_mkfs() _scratch_mkfs_xfs $* ;; nfs*) - # do nothing for nfs + # unable to re-create NFS, just remove all files in $SCRATCH_MNT to + # avoid EEXIST caused by the leftover files created in previous runs + _scratch_mount + rm -rf $SCRATCH_MNT/* + _scratch_unmount ;; cifs) # do nothing for cifs @@ -1032,8 +1036,14 @@ _require_scratch_nocheck() { case "$FSTYP" in nfs*) - _notrun "requires a scratch device" - ;; + echo $SCRATCH_DEV | grep -q ":/" > /dev/null 2>&1 + if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then + _notrun "this test requires a valid \$SCRATCH_DEV" + fi + if [ ! -d "$SCRATCH_MNT" ]; then + _notrun "this test requires a valid \$SCRATCH_MNT" + fi + ;; cifs) _notrun "requires a scratch device" ;;
This commit disables tests requires scratch dev running on NFS c041421 xfstests: stop special casing nfs and udf Now re-enable them to get a larger test coverage on NFS. Signed-off-by: Eryu Guan <eguan@redhat.com> --- common/rc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)