diff mbox series

[4/8] generic/740: skip jffs2 as foreign fs earlier

Message ID 20240623121103.974270-5-hch@lst.de (mailing list archive)
State New
Headers show
Series [1/8] remove support for ext4dev | expand

Commit Message

Christoph Hellwig June 23, 2024, 12:10 p.m. UTC 
Commit a633d252e3c4 ("shared/032: add options for jffs2") added a
check to skip checking the overwrite of jffs2, but only after
adding specific mkfs options for it and zeroing part of the device.

Switch to skipping it earlier in a more obvious place.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/740 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/tests/generic/740 b/tests/generic/740
index 6a97ac69a..bac927227 100755
--- a/tests/generic/740
+++ b/tests/generic/740
@@ -46,8 +46,8 @@  do
 		preargs="-p lock_nolock -j 1"
 		;;
 	jffs2)
-		# jffs2 mkfs requires '-r $directory' and '-o $image'
-		preargs="-r /proc/fs -o"
+		# mkfs.jffs2 doesn't work like a normal mkfs and just fails
+		continue;
 		;;
 	jfs)
 		preop="echo Y |"
@@ -79,8 +79,6 @@  do
 
 	if [ $? -eq 0 ] ; then
 		# next, ensure we don't overwrite it
-		# jffs2 mkfs doesn't check overwrite case
-		[ $fs = jffs2 ] && continue
 
 		echo "=== Attempting $FSTYP overwrite of $fs..." >>$seqres.full
 		${MKFS_PROG} -t $FSTYP $SCRATCH_DEV >>$seqres.full 2>&1