From: Theodore Ts'o Date: Sat, 11 Aug 2007 04:00:01 +0000 (-0400) Subject: Remove e2fsck's swapfs test, since we've removed the functionality X-Git-Tag: v1.41-WIP-0427~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd44eb6b7f2fc0d9f7499b479688bbecf132773b;p=thirdparty%2Fe2fsprogs.git Remove e2fsck's swapfs test, since we've removed the functionality Signed-off-by: "Theodore Ts'o" --- diff --git a/tests/f_swapfs/debugfs.cmd b/tests/f_swapfs/debugfs.cmd deleted file mode 100644 index df583b241..000000000 --- a/tests/f_swapfs/debugfs.cmd +++ /dev/null @@ -1,5 +0,0 @@ -ls -stat sym -stat double-indirect-test -cat fluff -quit diff --git a/tests/f_swapfs/expect b/tests/f_swapfs/expect deleted file mode 100644 index ecbb99071..000000000 --- a/tests/f_swapfs/expect +++ /dev/null @@ -1,133 +0,0 @@ -Swapfs test -e2fsck -yf -N test_filesys -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: 25/256 files (0.0% non-contiguous), 418/1024 blocks -Exit status is 0 -e2fsck -Sy -N test_filesys -Pass 0: Doing byte-swap of filesystem -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: 25/256 files (0.0% non-contiguous), 418/1024 blocks -Exit status is 0 -Running debugfs.... -debugfs: ls - 2 (12) . 2 (12) .. 11 (20) lost+found 12 (16) fluff - 13 (28) indirect-fluff-test 14 (28) double-indirect-test - 15 (20) sym 16 (24) long-sym-test 17 (864) dir-test -debugfs: stat sym -Inode: 15 Type: symlink Mode: 0777 Flags: 0x0 Generation: 1 -User: 0 Group: 0 Size: 5 -File ACL: 0 Directory ACL: 0 -Links: 1 Blockcount: 0 -Fragment: Address: 0 Number: 0 Size: 0 -ctime: 0x322737e2 -- Fri Aug 30 18:50:10 1996 -atime: 0x322737e2 -- Fri Aug 30 18:50:10 1996 -mtime: 0x322737e2 -- Fri Aug 30 18:50:10 1996 -Fast_link_dest: fluff -debugfs: stat double-indirect-test -Inode: 14 Type: regular Mode: 0644 Flags: 0x0 Generation: 1 -User: 0 Group: 0 Size: 348960 -File ACL: 0 Directory ACL: 0 -Links: 1 Blockcount: 688 -Fragment: Address: 0 Number: 0 Size: 0 -ctime: 0x322488cf -- Wed Aug 28 17:58:39 1996 -atime: 0x322488cf -- Wed Aug 28 17:58:39 1996 -mtime: 0x322488cf -- Wed Aug 28 17:58:39 1996 -BLOCKS: -(0-11):70-81, (IND):82, (12-267):83-338, (DIND):339, (IND):340, (268-340):341-413 -TOTAL: 344 - -debugfs: cat fluff -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip - -debugfs: quit -Exit status is 0 -e2fsck -yf -N test_filesys -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: 25/256 files (0.0% non-contiguous), 418/1024 blocks -Exit status is 0 -e2fsck -sy -N test_filesys -Pass 0: Doing byte-swap of filesystem -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: 25/256 files (0.0% non-contiguous), 418/1024 blocks -Exit status is 0 -Running debugfs.... -debugfs: ls - 2 (12) . 2 (12) .. 11 (20) lost+found 12 (16) fluff - 13 (28) indirect-fluff-test 14 (28) double-indirect-test - 15 (20) sym 16 (24) long-sym-test 17 (864) dir-test -debugfs: stat sym -Inode: 15 Type: symlink Mode: 0777 Flags: 0x0 Generation: 1 -User: 0 Group: 0 Size: 5 -File ACL: 0 Directory ACL: 0 -Links: 1 Blockcount: 0 -Fragment: Address: 0 Number: 0 Size: 0 -ctime: 0x322737e2 -- Fri Aug 30 18:50:10 1996 -atime: 0x322737e2 -- Fri Aug 30 18:50:10 1996 -mtime: 0x322737e2 -- Fri Aug 30 18:50:10 1996 -Fast_link_dest: fluff -debugfs: stat double-indirect-test -Inode: 14 Type: regular Mode: 0644 Flags: 0x0 Generation: 1 -User: 0 Group: 0 Size: 348960 -File ACL: 0 Directory ACL: 0 -Links: 1 Blockcount: 688 -Fragment: Address: 0 Number: 0 Size: 0 -ctime: 0x322488cf -- Wed Aug 28 17:58:39 1996 -atime: 0x322488cf -- Wed Aug 28 17:58:39 1996 -mtime: 0x322488cf -- Wed Aug 28 17:58:39 1996 -BLOCKS: -(0-11):70-81, (IND):82, (12-267):83-338, (DIND):339, (IND):340, (268-340):341-413 -TOTAL: 344 - -debugfs: cat fluff -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip -yabba dabba doo. cocka doodle doo. yabba dabba doo. cocka doodle doo. yipyip - -debugfs: quit -Exit status is 0 -e2fsck -yf -N test_filesys -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: 25/256 files (0.0% non-contiguous), 418/1024 blocks -Exit status is 0 diff --git a/tests/f_swapfs/image b/tests/f_swapfs/image deleted file mode 100644 index e7b24b946..000000000 Binary files a/tests/f_swapfs/image and /dev/null differ diff --git a/tests/f_swapfs/image.gz b/tests/f_swapfs/image.gz deleted file mode 100644 index 852231bd4..000000000 Binary files a/tests/f_swapfs/image.gz and /dev/null differ diff --git a/tests/f_swapfs/name b/tests/f_swapfs/name deleted file mode 100644 index b4520ba52..000000000 --- a/tests/f_swapfs/name +++ /dev/null @@ -1 +0,0 @@ -checking the e2fsck swapfs functionality diff --git a/tests/f_swapfs/script b/tests/f_swapfs/script deleted file mode 100644 index 75f9fb426..000000000 --- a/tests/f_swapfs/script +++ /dev/null @@ -1,79 +0,0 @@ -if $FSCK -SV > /dev/null 2>&1 ; then - IMAGE=$test_dir/image.gz - VERIFY_FSCK_OPT=-yf - SWAP_FSCK_OPT=-Sy - NATIVE_FSCK_OPT=-sy - OUT=$test_name.log - EXP=$test_dir/expect - - gunzip < $IMAGE > $TMPFILE - - echo "Swapfs test" > $OUT - - echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new - $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '2d' $OUT.new >> $OUT - - echo e2fsck $SWAP_FSCK_OPT -N test_filesys > $OUT.new - $FSCK $SWAP_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '2d' $OUT.new >> $OUT - - echo Running debugfs.... >> $OUT - $DEBUGFS -f $test_dir/debugfs.cmd $TMPFILE > $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '1d' $OUT.new >> $OUT - - echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new - $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '2d' $OUT.new >> $OUT - - echo e2fsck $NATIVE_FSCK_OPT -N test_filesys > $OUT.new - $FSCK $NATIVE_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '2d' $OUT.new >> $OUT - - echo Running debugfs.... >> $OUT - $DEBUGFS -f $test_dir/debugfs.cmd $TMPFILE > $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '1d' $OUT.new >> $OUT - - echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new - $FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1 - status=$? - echo Exit status is $status >> $OUT.new - sed -e '2d' $OUT.new >> $OUT - rm -f $OUT.new - - rm $TMPFILE - - # - # Do the verification - # - - rm -f $test_name.ok $test_name.failed - cmp -s $OUT $EXP - status=$? - - if [ "$status" = 0 ] ; then - echo "ok" - touch $test_name.ok - else - echo "failed" - diff $DIFF_OPTS $EXP $OUT > $test_name.failed - fi - - unset IMAGE VERIFY_FSCK_OPT SWAP_FSCK_OPT NATIVE_FSCK_OPT OUT EXP - -else - rm -f $test_name.ok $test_name.failed - echo "skipped" -fi