From c759616b8740a25e3e51e4add8df140514ff32ba Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 22 Jun 2018 17:54:50 -0400 Subject: [PATCH] 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 Signed-off-by: Theodore Ts'o --- tests/f_extent_htree/expect.pre.1 | 29 +++++++++++++++++++++++++++++ tests/f_extent_htree/expect.pre.2 | 7 +++++++ tests/f_extent_htree/image.gz | Bin 10101 -> 0 bytes tests/f_extent_htree/script | 14 -------------- tests/f_uninit_cat/script | 2 +- 5 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 tests/f_extent_htree/expect.pre.1 create mode 100644 tests/f_extent_htree/expect.pre.2 delete mode 100644 tests/f_extent_htree/image.gz 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 284207efb12a04136c9f26c33f2197fed97cbd99..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 10101 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%0A=Y5K=UnA>_L{Z$6(ITbDZ{AOTK8qJ zVP0-M(};}wPu~ncYw;e2v4)Ut*OflUrSUI+dINPd8nx1Y20RL5UF&EaIIl42qo~-# zJ!sTW*i3A8pW6yIwD$jc;lcPgIq`+HxCU;>w0_IFn#&R^>fmnAxtHEmfZ&p>gav(G zD}Zn*C>Ww1o_(Z(SEg5kb)Rc&`@S{gM|tRhvZrBxfX&$$4I8Z)hc@choU=c>)`#jr z-!dpSAisj|Q*uwRA&*I7W0ftL_N8>Z=*;#z+VQ`B_gy;D7cA$#6vbv1Vu&w*A>HEd%LizWV zcYL?!cm1xEQVw)HOfLdN$uDyjg(JW--h~u#^VLg8`E|xqn>{JH#ma0U^Ygr@63MIGs`p2f(n97w65h2i zbX#t2JmGzMOn&f0S&paWm$#`CB>^+5%}d+foL1s*+b;^0^X)n47oR{}aofo@Qn8+) zX1Ft7@gh(!sg-9)wmvngK0@M#cSxBJ8?%bg{m+%z*mb=}O`UUhz44PrFt?DS#6V}! zLcGo>PWtcHeLQ`2bMd>o#wN#v>+;Xo$C(!y!hTBQ1^bq!0g<5outYbZbyz012zU0z zcNJG*$Z=&6gJ0`oSI59uu1!vzr`SS41_P zbs>kHtwd!hX%jk#V)H7rbzD?Treo`?lSOpLs5b|qkS*w13fplro<1S&NkC>KWl*|r zbJ;|5UI(*`5dvD`y(VHGjn7q6JYO249FoUHUeRMzyST3_LtF+;SkIENowtG1s z+XdT@#3fmQzRXW_ z_rKxt3ya=$FO;Z87L;7gUZPA3byC?lD80}k#XbqeOaE0OZzE)nYFmAaxM5w}&xj&r zO$Tb6<%K}`wnN#`aWdOEE308S&PpC1iO?m|nvd^;j7`*#(|=$X!S_`3u{g*G?ELK;z8<9%WWetSLTdu|Glr- zQB}3V%b8x(G?7D!U}}Gr*wXweW_x{#<43dydleew{COhh)hy0?hmtt9GJ*c6+YlTH z{JAGWPrf#Gr4DE&U)Q@xe~XKHpm(YXB3QecxS<7nmvM@dvj2J^F`4>57VHvE7b^%p zX)$srUN2vJLI2j#fySAjDPt?;PZPgXrbi&vxlibl&xF?HYH49vH7m(tNN8kvhstYi z$r{|M%30H>Dhdr#BuLjDP%|rTVj)rLktLmyiA7w#|JN%^B;4ub68|fexG-?FGE5d5 z_W9MykW%5AG|4@^#n55iE^jAtcX?`5WUqqNT;0DC+d}Z{`WU6}zjdCak6uZpJC(?v k(+XKrm&7(4>N3VW_|N~tzi> $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 -- 2.47.2