tests, mke2fs: add option to suppress xattr copying to fix f_extent_htree

[tools/e2fsprogs.git] / tests / f_extent_htree / script

diff --git a/tests/f_extent_htree/script b/tests/f_extent_htree/script
index 60854c6..4939acc 100644 (file)
--- a/tests/f_extent_htree/script
+++ b/tests/f_extent_htree/script
@@ -1,16 +1,4 @@
 #!/bin/bash
-
-FSCK_OPT="-fyvD"
-. $cmd_dir/run_e2fsck
-
-exit $?
-# This script depends on "mke2fs -d", which is only in master and not maint,
-# to populate the file directory tree poorly (namely that there are no
-# contiguous blocks in the directory leaf and the extent tree is large).
-
-# Once the "mke2fs -d" option is available on the "maint" branch, the
-# above few lines should be deleted, along with the "image.gz" file.
-
 TMPDIR=${TMPDIR:-"/tmp"}
 OUT=$test_name.log
 
@@ -42,8 +30,8 @@ fi
 # make filesystem with enough inodes and blocks to hold all the test files
 > $TMPFILE
 NUM=$((NUM * 5 / 3))
-echo "mke2fs -b $BSIZE -O dir_index,extent -d$SRC -N$NUM $TMPFILE $NUM" >> $OUT
-$MKE2FS -b $BSIZE -O dir_index,extent -d$SRC -N$NUM $TMPFILE $NUM >> $OUT 2>&1
+echo "mke2fs -b $BSIZE -O dir_index,extent -E no_copy_xattrs -d$SRC -N$NUM $TMPFILE $NUM" >> $OUT
+$MKE2FS -b $BSIZE -O dir_index,extent -E no_copy_xattrs -d$SRC -N$NUM $TMPFILE $NUM >> $OUT 2>&1
 rm -r $SRC
 
 # Run e2fsck to convert dir to htree before deleting the files, as mke2fs
@@ -64,6 +52,5 @@ $DEBUGFS -c -R "htree subdir" $TMPFILE 2>> $OUT |
        awk '/yyyyy/ { print "rm '$SUB'/"$4 }' > $DELETE_LIST
 $DEBUGFS -w -f $DELETE_LIST $TMPFILE >> $OUT 2>&1
 rm $DELETE_LIST
-cp $TMPFILE $TMPFILE.sav
 
 . $cmd_dir/run_e2fsck