tests: Use our own mke2fs.conf file

Use a standard, fixed mke2fs.conf file so that if downstream
distributions want to change the mke2fs.conf which is distributed in
the RPM or dpkg file, it won't screw up the regression tests.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3659087..148813e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -23,8 +23,8 @@ test_script: test_script.in Makefile mke2fs.conf
        @cat $(srcdir)/test_script.in >> test_script
        @chmod +x test_script
 
-mke2fs.conf: $(srcdir)/../misc/mke2fs.conf
-       sed -e 's/blocksize = -1/blocksize = 4096/' $(srcdir)/../misc/mke2fs.conf >mke2fs.conf
+mke2fs.conf: $(srcdir)/mke2fs.conf.in
+       $(CP) $(srcdir)/mke2fs.conf.in mke2fs.conf
 
 check:: test_script
        @echo "Running e2fsprogs test suite..."

diff --git a/tests/mke2fs.conf.in b/tests/mke2fs.conf.in
new file mode 100644 (file)
index 0000000..34539fa
--- /dev/null
+++ b/tests/mke2fs.conf.in
@@ -0,0 +1,44 @@
+[defaults]
+       base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+       blocksize = 4096
+       inode_size = 256
+       inode_ratio = 16384
+
+[fs_types]
+       ext3 = {
+               features = has_journal
+       }
+       ext4 = {
+               features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+               inode_size = 256
+       }
+       ext4dev = {
+               features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+               inode_size = 256
+               options = test_fs=1
+       }
+       small = {
+               blocksize = 1024
+               inode_size = 128
+               inode_ratio = 4096
+       }
+       floppy = {
+               blocksize = 1024
+               inode_size = 128
+               inode_ratio = 8192
+       }
+       news = {
+               inode_ratio = 4096
+       }
+       largefile = {
+               inode_ratio = 1048576
+               blocksize = 4096
+       }
+       largefile4 = {
+               inode_ratio = 4194304
+               blocksize = 4096
+       }
+       hurd = {
+            blocksize = 4096
+            inode_size = 128
+       }