From: Andreas Dilger <adilger@dilger.ca>
Date: Fri, 22 Jun 2018 21:54:50 +0000 (-0400)
Subject: tests: remove pre-generated f_extent_htree image
X-Git-Tag: v1.44.3-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c759616b8740a25e3e51e4add8df140514ff32ba;p=thirdparty%2Fe2fsprogs.git

tests: remove pre-generated f_extent_htree image

The f_extent_htree test depends on the "mke2fs -d" functionality
that did not exist in the maint branch when the patch was landed.
On master this functionality exists and should be used instead of
a pre-generated image.  That exercises the "mke2fs -d" functionality
as well as e2fsck better.

[ Fixed to add missing expect.pre.? files --tytso ]

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/tests/f_extent_htree/expect.pre.1 b/tests/f_extent_htree/expect.pre.1
new file mode 100644
index 000000000..e489c302e
--- /dev/null
+++ b/tests/f_extent_htree/expect.pre.1
@@ -0,0 +1,29 @@
+Pass 1: Checking inodes, blocks, and sizes
+Pass 2: Checking directory structure
+Pass 3: Checking directory connectivity
+Pass 3A: Optimizing directories
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+
+test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
+
+         522 inodes used (60.98%, out of 856)
+           0 non-contiguous files (0.0%)
+           1 non-contiguous directory (0.2%)
+             # of inodes with ind/dind/tind blocks: 0/0/0
+             Extent depth histogram: 512/1
+         815 blocks used (95.88%, out of 850)
+           0 bad blocks
+           0 large files
+
+         510 regular files
+           3 directories
+           0 character device files
+           0 block device files
+           0 fifos
+           0 links
+           0 symbolic links (0 fast symbolic links)
+           0 sockets
+------------
+         513 files
+Exit status is 0
diff --git a/tests/f_extent_htree/expect.pre.2 b/tests/f_extent_htree/expect.pre.2
new file mode 100644
index 000000000..667c1476c
--- /dev/null
+++ b/tests/f_extent_htree/expect.pre.2
@@ -0,0 +1,7 @@
+Pass 1: Checking inodes, blocks, and sizes
+Pass 2: Checking directory structure
+Pass 3: Checking directory connectivity
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+test_filesys: 522/856 files (0.2% non-contiguous), 815/850 blocks
+Exit status is 0
diff --git a/tests/f_extent_htree/image.gz b/tests/f_extent_htree/image.gz
deleted file mode 100644
index 284207efb..000000000
Binary files a/tests/f_extent_htree/image.gz and /dev/null differ
diff --git a/tests/f_extent_htree/script b/tests/f_extent_htree/script
index 35aaf19df..ccd97e14f 100644
--- a/tests/f_extent_htree/script
+++ b/tests/f_extent_htree/script
@@ -1,17 +1,4 @@
 #!/bin/bash
-
-FSCK_OPT="-fyvD"
-. $cmd_dir/run_e2fsck
-rm -f $TMPFILE
-
-exit 0
-# 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
 
@@ -65,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
diff --git a/tests/f_uninit_cat/script b/tests/f_uninit_cat/script
index f2443fa3b..31a198883 100755
--- a/tests/f_uninit_cat/script
+++ b/tests/f_uninit_cat/script
@@ -14,7 +14,7 @@ gzip -d < $IMAGE > $TMPFILE
 EXP=$test_dir/expect
 OUT=$test_name.log
 
-$FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 > $OUT.new
+$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
 echo "Exit status is $?" >> $OUT.new
 
 echo "debugfs cat uninit file" >> $OUT.new