Skip to contentSkip to conversation

xfstests integration

DISCUSSION David Disseldorp 3 participants 5 messages Aug 5, 2013 – Aug 12, 2013 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Steve,

At SambaXP this year you mentioned that you had done some preliminary work towards using the xfstests suite alongside cifs.ko. Do you happen to still have the git repo lying around somewhere?

Cheers, David

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

I couldn't find much - but I did see this small patch which I had put together quickly so they could run against cifs

common +8 -0
index 0723224..b2334f8 100644
@@ -126,6 +126,7 @@ check options
     -xfs                test XFS (default)
     -udf                test UDF
     -nfs                test NFS
+    -cifs               test CIFS
     -l			line mode diff
     -xdiff		graphical mode diff
     -udiff		show unified diff (default)
@@ -158,6 +159,11 @@ testlist options
 	    xpand=false
 	    ;;
 
+	-cifs)	# -cifs ... set FSTYP to cifs
+	    FSTYP=cifs
+	    xpand=false
+	    ;;
+
 	-g)	# -g group ... pick from group file
 	    group=true
 	    xpand=false
@@ -311,4 +317,6 @@ case "$FSTYP" in
 	 ;;
     nfs)
 	 ;;
+    cifs)
+	 ;;
 esac
common.config +1 -1
index 7bed1c5..1e37840 100644
@@ -188,6 +188,7 @@ case "$HOSTOS" in
         export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
         export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
         export MKFS_NFS_PROG="false"
+	export MKFS_CIFS_PROG="false"
         ;;
 esac
 
@@ -221,7 +222,7 @@ fi
 
 echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
 if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
-    echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block

device or a NFS filesystem"
+ echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block
device or an NFS or CIFS filesystem"
exit 1
fi

@@ -243,7 +244,7 @@ fi

echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]; then
- echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a
block device or a NFS filesystem"
+ echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a
block device or an NFS or CIFS filesystem"
exit 1
fi

common.rc +49 -1

91 lines not on this page · raw message

 # this function calls _setup_udf_scratchdir and _setup_udf_scratchdir
@@ -1535,6 +1584,9 @@ _setup_testdir()
     nfs*)
 	_setup_nfs_scratchdir
 	;;
+    cifs)
+	_setup_cifs_scratchdir
+	;;
     *)
 	testdir=$TEST_DIR
 	;;
@@ -1552,6 +1604,10 @@ _cleanup_testdir()
 	# umount testdir as it is $SCRATCH_MNT which could be used by xfs next
 	[ -n "$testdir" ] && $UMOUNT_PROG $testdir
 	;;
+    cifs)
+	# umount testdir as it is $SCRATCH_MNT which could be used by xfs next
+	[ -n "$testdir" ] && $UMOUNT_PROG $testdir
+	;;
     *)
 	# do nothing, testdir is $TEST_DIR
 	:
Quoted 7 lines · David Disseldorp

Hi Steve,

At SambaXP this year you mentioned that you had done some preliminary work towards using the xfstests suite alongside cifs.ko. Do you happen to still have the git repo lying around somewhere?

Cheers, David

Signature · 3 lines
Thanks,

Steve
common +8 -0
index 0723224..b2334f8 100644
@@ -126,6 +126,7 @@ check options
     -xfs                test XFS (default)
     -udf                test UDF
     -nfs                test NFS
+    -cifs               test CIFS
     -l			line mode diff
     -xdiff		graphical mode diff
     -udiff		show unified diff (default)
@@ -158,6 +159,11 @@ testlist options
 	    xpand=false
 	    ;;
 
+	-cifs)	# -cifs ... set FSTYP to cifs
+	    FSTYP=cifs
+	    xpand=false
+	    ;;
+
 	-g)	# -g group ... pick from group file
 	    group=true
 	    xpand=false
@@ -311,4 +317,6 @@ case "$FSTYP" in
 	 ;;
     nfs)
 	 ;;
+    cifs)
+	 ;;
 esac
common.config +3 -2
index 7bed1c5..1e37840 100644
@@ -188,6 +188,7 @@ case "$HOSTOS" in
         export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
         export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
         export MKFS_NFS_PROG="false"
+	export MKFS_CIFS_PROG="false"
         ;;
 esac
 
@@ -221,7 +222,7 @@ fi
 
 echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
 if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
-    echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"
+    echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or an NFS or CIFS filesystem"
     exit 1
 fi
 
@@ -243,7 +244,7 @@ fi
 
 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
 if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]; then
-    echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or a NFS filesystem"
+    echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or an NFS or CIFS filesystem"
     exit 1
 fi
 
common.rc +56 -0

110 lines not on this page · raw message

A message that is not in the archive (sent off-list or not yet received): CAH2r5mv_z=_P0R=uMfrSuwLoUU+OHyf8bmHnuwRuLsN0a8XF-A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#4 lore raw
Quoted 2 lines · On Mon, 5 Aug 2013 11:53:17 -0500 Steve French…

I couldn't find much - but I did see this small patch which I had put together quickly so they could run against cifs

Thanks Steve, looks like it should be helpful.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

I pulled the latest xfstests - and it looks my earlier patch needs additional minor changes before submission due to changes in xfstest.

Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Steve French

I couldn't find much - but I did see this small patch which I had put together quickly so they could run against cifs

Can you please send it to the xfs list for inclusion? Thanks!

Signature · 3 lines
Thanks,

Steve