Skip to contentSkip to conversation

xfstests: UDF support improvements

PATCH In review Jan Kara 4 participants 6 messages Dec 23, 2013 – Jan 8, 2014

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/2 Fix output parsing in _check_udf_filesystem()

Move of tests into separate subdirectories broke sed(1) expression in _check_udf_filesystem(). Actually use of sed in that place was rather stupid so just replace it with plain echo.

---
 common/rc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
common/rc +2 -3
index fe6bbfcbfc55..12f0196655a8 100644
@@ -1582,9 +1582,8 @@ _check_udf_filesystem()
     sleep 1 # Due to a problem with time stamps in udf_test
     $here/src/udf_test $OPT_ARG $device | tee $seqres.checkfs | egrep "Error|Warning" | \
 	_udf_test_known_error_filter | \
-	egrep -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" | \
-	sed "s/^.*$/Warning UDF Verifier reported errors see $seqres.checkfs./g"
-
+	egrep -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" && \
+        echo "Warning UDF Verifier reported errors see $seqres.checkfs."
 }
 
 _check_xfs_test_fs()
Signature · 6 lines
1.8.1.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
author
#2 lore raw

PATCH 2/2 Add udf support into _scratch_mkfs_sized

In reply to Jan Kara
---
 common/rc | 3 +++
 1 file changed, 3 insertions(+)
common/rc +3 -0
index 12f0196655a8..22cd975b3fe8 100644
@@ -563,6 +563,9 @@ _scratch_mkfs_sized()
     ext2|ext3|ext4|ext4dev)
 	yes | ${MKFS_PROG}.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
 	;;
+    udf)
+	$MKFS_UDF_PROG $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
+	;;
     btrfs)
 	$MKFS_BTRFS_PROG $MKFS_OPTIONS -b $fssize $SCRATCH_DEV
 	;;
Signature · 6 lines
1.8.1.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on the v1 series
#4 lore raw
In reply to Jan Kara

Looks good to me

Quoted 11 lines · Jan Kara

Hello,

below are two patches which improve UDF support in xfstests.

Honza

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Signature · 6 lines
Carlos

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#5 lore raw
In reply to Jan Kara

This series has been committed.

Thanks
--Rich

commit 7e4cac452bf38ee4ace80b60efca7f6318b88eea

Author: Jan Kara <[email protected]>
Date:   Mon Dec 23 22:53:51 2013 +0000

Add udf support into _scratch_mkfs_sized

commit 49684caded92f23dd18ec4698917e087f23a9016

Author: Jan Kara <[email protected]>
Date:   Mon Dec 23 22:53:50 2013 +0000

Fix output parsing in _check_udf_filesystem()

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs