vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

tests: clean up sed filtering of test output 

The sed filters for test outputs that are used to remove build and
test specific information (such as version strings, dates, times,
UUIDs) were unconditionally deleting the first line of output.  This
would normally contain the tool version string, but in some cases
contained other information that was being lost.  This can lead to
difficulty debugging test failures.

The sed filtering has been changed to only remove the actual version
strings.  As well, similar filter strings were duplicated throughout
many scripts, and "sed" and "tr" were often called multiple times in
a pipeline.  These have been consolidated into a single filter.sed
file to avoid having to maintain these filters in multiple places.

In a few cases, accidentally deleted messages have been restored to
the expect output for the tests.  In other cases, trivial whitespace
has been changed in the expect files.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
debian-1.42.9
Andreas Dilger 2013-06-15 18:44:09 -04:00 committed by Theodore Ts'o
parent 4718395120
commit f9fd342e56
30 changed files with 86 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/d_loaddump/script
View File

@ -24,19 +24,19 @@ echo "debugfs -R ''write $TEST_DATA test_data'' -w test.img" > $OUT.new
$DEBUGFS -R "write $TEST_DATA test_data" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "write $TEST_DATA test_data" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
$FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''dump test_data $VERIFY_DATA'' test.img" > $OUT.new echo "debugfs -R ''dump test_data $VERIFY_DATA'' test.img" > $OUT.new
$DEBUGFS -R "dump test_data $VERIFY_DATA" $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "dump test_data $VERIFY_DATA" $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "cmp $TEST_DATA $VERIFY_DATA" >> $OUT echo "cmp $TEST_DATA $VERIFY_DATA" >> $OUT
cmp $TEST_DATA $VERIFY_DATA >>$OUT cmp $TEST_DATA $VERIFY_DATA >>$OUT

14
tests/d_special_files/script
View File

@ -33,43 +33,43 @@ echo "debugfs -R ''stat foo'' -w test.img" > $OUT.new
$DEBUGFS -R "stat foo" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "stat foo" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat foo2'' -w test.img" > $OUT.new echo "debugfs -R ''stat foo2'' -w test.img" > $OUT.new
$DEBUGFS -R "stat foo2" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "stat foo2" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''block_dump 28'' -w test.img" > $OUT.new echo "debugfs -R ''block_dump 28'' -w test.img" > $OUT.new
$DEBUGFS -R "block_dump 28" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "block_dump 28" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat pipe'' -w test.img" > $OUT.new echo "debugfs -R ''stat pipe'' -w test.img" > $OUT.new
$DEBUGFS -R "stat pipe" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "stat pipe" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat sda'' -w test.img" > $OUT.new echo "debugfs -R ''stat sda'' -w test.img" > $OUT.new
$DEBUGFS -R "stat sda" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "stat sda" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat null'' -w test.img" > $OUT.new echo "debugfs -R ''stat null'' -w test.img" > $OUT.new
$DEBUGFS -R "stat null" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "stat null" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
$FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
# #
# Do the verification # Do the verification

1
tests/f_jnl_32bit/expect.0
View File

@ -1,4 +1,3 @@
Journal starts at block 1, transaction 2 Journal starts at block 1, transaction 2
Found expected sequence 2, type 1 (descriptor block) at block 1 Found expected sequence 2, type 1 (descriptor block) at block 1
Dumping descriptor block, sequence 2, at block 1: Dumping descriptor block, sequence 2, at block 1:

2
tests/f_jnl_32bit/script
View File

@ -1,4 +1,4 @@
PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs > $test_name.0.log' PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log'
PASS_ZERO=true PASS_ZERO=true
. $cmd_dir/run_e2fsck . $cmd_dir/run_e2fsck

1
tests/f_jnl_64bit/expect.0
View File

@ -1,4 +1,3 @@
Journal starts at block 67, transaction 32 Journal starts at block 67, transaction 32
Found expected sequence 32, type 5 (revoke table) at block 67 Found expected sequence 32, type 5 (revoke table) at block 67
Dumping revoke block, sequence 32, at block 67: Dumping revoke block, sequence 32, at block 67:

2
tests/f_jnl_64bit/script
View File

@ -1,4 +1,4 @@
PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs > $test_name.0.log' PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log'
PASS_ZERO=true PASS_ZERO=true
. $cmd_dir/run_e2fsck . $cmd_dir/run_e2fsck

1
tests/f_jnl_errno/expect.0
View File

@ -1,4 +1,3 @@
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/f_jnl_errno/script
View File

@ -1,4 +1,4 @@
AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs > $test_name.0.log' AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log'
PASS_ZERO=true PASS_ZERO=true
. $cmd_dir/run_e2fsck . $cmd_dir/run_e2fsck

1
tests/f_orphan_indirect_inode/expect.1
View File

@ -1,2 +1,3 @@
test_filesys: Truncating orphaned inode 12 (uid=0, gid=0, mode=0100644, size=0)
test_filesys: clean, 12/16 files, 21/100 blocks test_filesys: clean, 12/16 files, 21/100 blocks
Exit status is 0 Exit status is 0

1
tests/f_preen/expect.1
View File

@ -1,3 +1,4 @@
test_filesys: Note: if several inode or block bitmap blocks or part
of the inode table require relocation, you may wish to try of the inode table require relocation, you may wish to try
running e2fsck with the '-b 8193' option first. The problem running e2fsck with the '-b 8193' option first. The problem
may lie only with the primary block group descriptors, and may lie only with the primary block group descriptors, and

36
tests/f_resize_inode/script
View File

@ -15,15 +15,13 @@ cp /dev/null $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT echo mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
$MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \ $MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 |
| sed -e '1d' | grep -v "automatically checked" | sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
grep -v 'Discarding device blocks' |
grep -v "whichever comes first" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
echo ----------------------------------------------- >> $OUT echo ----------------------------------------------- >> $OUT
@ -33,18 +31,18 @@ echo "debugfs -R ''set_inode_field <7> block[2] 42'' -w test.img" > $OUT.new
$DEBUGFS -R "set_inode_field <7> block[2] 42" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "set_inode_field <7> block[2] 42" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
echo ----------------------------------------------- >> $OUT echo ----------------------------------------------- >> $OUT
@ -54,18 +52,18 @@ echo "debugfs -R ''clri <7>'' -w test.img" > $OUT.new
$DEBUGFS -R "clri <7>" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "clri <7>" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
echo ----------------------------------------------- >> $OUT echo ----------------------------------------------- >> $OUT
@ -75,18 +73,18 @@ echo "debugfs -R ''set_inode_field <7> bmap[524] 57'' -w test.img" > $OUT.new
$DEBUGFS -R "set_inode_field <7> bmap[524] 57" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "set_inode_field <7> bmap[524] 57" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
echo ----------------------------------------------- >> $OUT echo ----------------------------------------------- >> $OUT
@ -96,12 +94,12 @@ echo "debugfs -R ''set_super_value reserved_gdt_blocks 15679'' -w test.img" > $O
$DEBUGFS -R "set_super_value reserved_gdt_blocks 15679" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "set_super_value reserved_gdt_blocks 15679" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
echo ----------------------------------------------- >> $OUT echo ----------------------------------------------- >> $OUT
@ -111,18 +109,18 @@ echo "debugfs -R ''set_super_value reserved_gdt_blocks 32'' -w test.img" > $OUT.
$DEBUGFS -R "set_super_value reserved_gdt_blocks 32" -w $TMPFILE >> $OUT.new 2>&1 $DEBUGFS -R "set_super_value reserved_gdt_blocks 32" -w $TMPFILE >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '2d' $OUT.new >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new

15
tests/filter_dumpe2fs → tests/filter.sed
View File

@ -1,14 +1,19 @@
1s/^.*$// /^[dbgumpe2fsckrsiz]* [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d
/^Filesystem UUID:/d s/\\015//g
/automatically checked/d
/^Directory Hash Seed:/d
/Discarding device blocks/d
/^Filesystem created:/d /^Filesystem created:/d
/^Filesystem flags:/d /^Filesystem flags:/d
/^Filesystem UUID:/d
/^JFS DEBUG:/d
/^Last write time:/d /^Last write time:/d
/^Last mount time:/d /^Last mount time:/d
/^Last checked:/d /^Last checked:/d
/^Directory Hash Seed:/d
/^Next check after:/d
/^Maximum mount count:/d
/^Lifetime writes:/d /^Lifetime writes:/d
/^Maximum mount count:/d
/^Next check after:/d
/Reserved blocks uid:/s/ (user .*)// /Reserved blocks uid:/s/ (user .*)//
/Reserved blocks gid:/s/ (group .*)// /Reserved blocks gid:/s/ (group .*)//
/whichever comes first/d
/^ Checksum /d /^ Checksum /d

2
tests/m_bigjournal/expect.1
View File

@ -1,5 +1,4 @@
Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent flex_bg sparse_super large_file huge_file uninit_bg dir_nlink extra_isize Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent flex_bg sparse_super large_file huge_file uninit_bg dir_nlink extra_isize
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -7,7 +6,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/1344 files (0.0% non-contiguous), 1286989/2750000 blocks test_filesys: 11/1344 files (0.0% non-contiguous), 1286989/2750000 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_dasd_bs/expect.1
View File

@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 1104/32768 blocks test_filesys: 11/16384 files (0.0% non-contiguous), 1104/32768 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_extent_journal/expect.1
View File

@ -19,7 +19,6 @@ Creating journal (4096 blocks): done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent sparse_super Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent sparse_super
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -27,7 +26,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 7460/65536 blocks test_filesys: 11/16384 files (0.0% non-contiguous), 7460/65536 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_large_file/expect.1
View File

@ -16,7 +16,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super large_file Filesystem features: ext_attr resize_inode dir_index filetype sparse_super large_file
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -24,7 +23,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/64 files (0.0% non-contiguous), 17/16384 blocks test_filesys: 11/64 files (0.0% non-contiguous), 17/16384 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_meta_bg/expect.1
View File

@ -17,7 +17,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr dir_index filetype meta_bg sparse_super Filesystem features: ext_attr dir_index filetype meta_bg sparse_super
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -25,7 +24,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

4
tests/m_mkfs_overhead/script
View File

@ -12,8 +12,8 @@ export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
cp /dev/null $OUT cp /dev/null $OUT
$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d | \ $MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 |
sed -e "s;$TMPFILE;test.img;" | tr -d \\015 > $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" > $OUT
rm -f $TMPFILE rm -f $TMPFILE

2
tests/m_mmp/expect.1
View File

@ -19,7 +19,6 @@ Multiple mount protection is enabled with update interval 5 seconds.
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype mmp sparse_super large_file Filesystem features: ext_attr resize_inode dir_index filetype mmp sparse_super large_file
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -27,7 +26,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/65536 files (0.0% non-contiguous), 2093/65536 blocks test_filesys: 11/65536 files (0.0% non-contiguous), 2093/65536 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_no_opt/expect.1
View File

@ -17,7 +17,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features:(none) Filesystem features:(none)
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -25,7 +24,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 2094/65536 blocks test_filesys: 11/16384 files (0.0% non-contiguous), 2094/65536 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_raid_opt/expect.1
View File

@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/32768 files (0.0% non-contiguous), 7238/131072 blocks test_filesys: 11/32768 files (0.0% non-contiguous), 7238/131072 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_std/expect.1
View File

@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 3364/65536 blocks test_filesys: 11/16384 files (0.0% non-contiguous), 3364/65536 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/m_uninit/expect.1
View File

@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg
Pass 1: Checking inodes, blocks, and sizes Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure Pass 2: Checking directory structure
Pass 3: Checking directory connectivity Pass 3: Checking directory connectivity
@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information Pass 5: Checking group summary information
test_filesys: 11/32768 files (0.0% non-contiguous), 5691/131072 blocks test_filesys: 11/32768 files (0.0% non-contiguous), 5691/131072 blocks
Exit status is 0 Exit status is 0
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

2
tests/r_inline_xattr/script
View File

@ -20,7 +20,7 @@ echo "resize2fs test.img 5M" >> $OUT
$RESIZE2FS $TMPFILE 5M 2>&1 >> $OUT.new 2>&1 $RESIZE2FS $TMPFILE 5M 2>&1 >> $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
# Look at inline extended attribute in resized fs # Look at inline extended attribute in resized fs
echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|name = ''" >> $OUT echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|name = ''" >> $OUT

4
tests/r_move_itable/expect
View File

@ -13,7 +13,6 @@ Pass 5: Checking group summary information
test_filesys: 11/1248 files (0.0% non-contiguous), 1281/9985 blocks test_filesys: 11/1248 files (0.0% non-contiguous), 1281/9985 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53
@ -312,7 +311,6 @@ Pass 5: Checking group summary information
test_filesys: 11/2496 files (0.0% non-contiguous), 1644/19969 blocks test_filesys: 11/2496 files (0.0% non-contiguous), 1644/19969 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53
@ -847,7 +845,6 @@ Pass 5: Checking group summary information
test_filesys: 11/3744 files (0.0% non-contiguous), 2007/29953 blocks test_filesys: 11/3744 files (0.0% non-contiguous), 2007/29953 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53
@ -1618,7 +1615,6 @@ Pass 5: Checking group summary information
test_filesys: 11/5024 files (0.0% non-contiguous), 2376/40000 blocks test_filesys: 11/5024 files (0.0% non-contiguous), 2376/40000 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

37
tests/r_move_itable/script
View File

@ -14,18 +14,17 @@ cp /dev/null $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -q -F -o Linux -b 1024 -g 256 test.img 1024 > $OUT echo mke2fs -q -F -o Linux -b 1024 -g 256 test.img 1024 > $OUT
$MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 2>&1 \ $MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 2>&1 |
| sed -e '1d' | grep -v "automatically checked" | sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
grep -v "whichever comes first" >> $OUT
echo resize2fs -p test.img 10000 >> $OUT echo resize2fs -p test.img 10000 >> $OUT
$RESIZE2FS -p $TMPFILE 10000 2>&1 | sed -e '1d' | \ $RESIZE2FS -p $TMPFILE 10000 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -34,18 +33,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT echo "--------------------------------" >> $OUT
echo resize2fs -p test.img 20000 >> $OUT echo resize2fs -p test.img 20000 >> $OUT
$RESIZE2FS -p $TMPFILE 20000 2>&1 | sed -e '1d' | \ $RESIZE2FS -p $TMPFILE 20000 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -54,18 +53,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT echo "--------------------------------" >> $OUT
echo resize2fs -p test.img 30000 >> $OUT echo resize2fs -p test.img 30000 >> $OUT
$RESIZE2FS -p $TMPFILE 30000 2>&1 | sed -e '1d' | \ $RESIZE2FS -p $TMPFILE 30000 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -74,18 +73,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT echo "--------------------------------" >> $OUT
echo resize2fs -p test.img 40000 >> $OUT echo resize2fs -p test.img 40000 >> $OUT
$RESIZE2FS -p $TMPFILE 40000 2>&1 | sed -e '1d' | \ $RESIZE2FS -p $TMPFILE 40000 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -94,7 +93,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
rm -f $TMPFILE rm -f $TMPFILE

3
tests/r_resize_inode/expect
View File

@ -11,7 +11,6 @@ Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 4513/65536 blocks test_filesys: 11/16384 files (0.0% non-contiguous), 4513/65536 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53
@ -459,7 +458,6 @@ Pass 5: Checking group summary information
test_filesys: 11/4096 files (0.0% non-contiguous), 2107/16384 blocks test_filesys: 11/4096 files (0.0% non-contiguous), 2107/16384 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53
@ -614,7 +612,6 @@ Pass 5: Checking group summary information
test_filesys: 11/41472 files (0.0% non-contiguous), 8361/165536 blocks test_filesys: 11/41472 files (0.0% non-contiguous), 8361/165536 blocks
Exit status is 0 Exit status is 0
dumpe2fs test.img dumpe2fs test.img
Filesystem volume name: <none> Filesystem volume name: <none>
Last mounted on: <not available> Last mounted on: <not available>
Filesystem magic number: 0xEF53 Filesystem magic number: 0xEF53

34
tests/r_resize_inode/script
View File

@ -14,18 +14,17 @@ cp /dev/null $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \ $MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 |
| sed -e '1d' | grep -v "automatically checked" | sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
grep -v "whichever comes first" >> $OUT
echo resize2fs test.img 65536 >> $OUT echo resize2fs test.img 65536 >> $OUT
$RESIZE2FS $TMPFILE 65536 2>&1 | sed -e '1d' | \ $RESIZE2FS $TMPFILE 65536 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -34,25 +33,24 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT echo "--------------------------------" >> $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT
$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 \ $MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 |
| sed -e '1d' | grep -v "automatically checked" | sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
grep -v "whichever comes first" >> $OUT
echo resize2fs test.img 16384 >> $OUT echo resize2fs test.img 16384 >> $OUT
$RESIZE2FS $TMPFILE 16384 2>&1 | sed -e '1d' | \ $RESIZE2FS $TMPFILE 16384 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -61,18 +59,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT echo "--------------------------------" >> $OUT
echo resize2fs test.img 165536 >> $OUT echo resize2fs test.img 165536 >> $OUT
$RESIZE2FS $TMPFILE 165536 2>&1 | sed -e '1d' | \ $RESIZE2FS $TMPFILE 165536 2>&1 |
sed -e "s;$TMPFILE;test.img;" >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT.new echo Exit status is $status >> $OUT.new
sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1 $DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@ -81,7 +79,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT echo dumpe2fs test.img >> $OUT
$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT $DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
rm -f $TMPFILE rm -f $TMPFILE
cmp -s $OUT $EXP cmp -s $OUT $EXP

6
tests/run_e2fsck
View File

@ -50,16 +50,14 @@ eval $PREP_CMD
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT1.new 2>&1 $FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT1.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT1.new echo Exit status is $status >> $OUT1.new
sed -e '1d' $OUT1.new | sed -e '/^JFS DEBUG:/d' | \ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
sed -e "s;$TMPFILE;test.img;" | tr -d \\015 >> $OUT1
rm -f $OUT1.new rm -f $OUT1.new
if [ "$ONE_PASS_ONLY" != "true" ]; then if [ "$ONE_PASS_ONLY" != "true" ]; then
$FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1 $FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1
status=$? status=$?
echo Exit status is $status >> $OUT2.new echo Exit status is $status >> $OUT2.new
sed -e '1d' $OUT2.new | sed -e '/^JFS DEBUG:/d' | \ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
sed -e "s;$TMPFILE;test.img;" > $OUT2
rm -f $OUT2.new rm -f $OUT2.new
fi fi

7
tests/run_mke2fs
View File

@ -11,8 +11,11 @@ MKE2FS_SKIP_PROGRESS=true
MKE2FS_SKIP_CHECK_MSG=true MKE2FS_SKIP_CHECK_MSG=true
export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
> $TMPFILE > $TMPFILE
PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d | grep -v "Discarding device blocks" | tr -d \\015 > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d | tr -d \\015 >> $OUT1 ; echo " " >> $OUT1' PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 |
AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs | tr -d \\015 >> $OUT1' sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" > $OUT1;
$DEBUGFS -R features $TMPFILE 2>&1 |
sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT1'
AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT1'
. $cmd_dir/run_e2fsck . $cmd_dir/run_e2fsck
else #if test -x $DEBUGFS_EXE; then else #if test -x $DEBUGFS_EXE; then