From dc669a14d375c7ebecd816c48dd491989ebc2df0 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 6 Mar 2024 17:25:30 +0100 Subject: [PATCH] Add xfs V5 image to tests. XFS V4 can be disabled in kernel, add image V5. Minimal 300M xfs size avoided by using QA variables magic in format: export TEST_DIR=1 TEST_DEV=1 QA_CHECK_FS=1 ; mkfs -t xfs ... --- tests/align-test | 13 ++++++++++--- tests/align-test2 | 13 ++++++++++--- tests/blockwise-compat-test | 9 +++++---- tests/img_fs_xfs5.img.xz | Bin 0 -> 8380 bytes tests/reencryption-compat-test | 4 ++-- 5 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 tests/img_fs_xfs5.img.xz diff --git a/tests/align-test b/tests/align-test index cc502a8f3..0c1e02aac 100755 --- a/tests/align-test +++ b/tests/align-test @@ -338,12 +338,19 @@ echo "# Create enterprise-class 4K drive with fs and LUKS images." # cryptsetup should properly use 4k block on direct-io add_device dev_size_mb=32 sector_size=4096 physblk_exp=0 num_tgts=1 opt_blks=64 for file in $(ls img_fs_*.img.xz) ; do - echo "Format using fs image $file." + echo -n "Format using fs image $file " xz -d -c $file | dd of=$DEV bs=1M 2>/dev/null || fail "bad image" [ ! -d $MNT_DIR ] && mkdir $MNT_DIR - mount $DEV $MNT_DIR || skip "Mounting image is not available." + mount $DEV $MNT_DIR 2>/dev/null + if [ $? -ne 0 ] ; then + echo "[N/A]" + continue + fi echo $PWD1 | $CRYPTSETUP luksFormat --type luks1 --key-size 256 $FAST_PBKDF $MNT_DIR/luks.img || fail echo $PWD2 | $CRYPTSETUP luksFormat --type luks1 --key-size 256 $FAST_PBKDF $MNT_DIR/luks.img --header $MNT_DIR/luks_header.img || fail - umount $MNT_DIR + umount $MNT_DIR || fail + echo "[OK]" done cleanup + +exit 0 diff --git a/tests/align-test2 b/tests/align-test2 index 23d418a8b..6ed82bc93 100755 --- a/tests/align-test2 +++ b/tests/align-test2 @@ -421,13 +421,18 @@ echo "# Create enterprise-class 4K drive with fs and LUKS images." # cryptsetup should properly use 4k block on direct-io add_device dev_size_mb=32 sector_size=4096 physblk_exp=0 num_tgts=1 opt_blks=64 for file in $(ls img_fs_*.img.xz) ; do - echo "Format using fs image $file." + echo -n "Format using fs image $file. " xz -d -c $file | dd of=$DEV bs=1M 2>/dev/null || fail "bad image" [ ! -d $MNT_DIR ] && mkdir $MNT_DIR - mount $DEV $MNT_DIR || skip "Mounting image is not available." + mount $DEV $MNT_DIR 2>/dev/null + if [ $? -ne 0 ] ; then + echo "[N/A]" + continue + fi echo $PWD1 | $CRYPTSETUP luksFormat $FAST_PBKDF --type luks2 $MNT_DIR/luks.img --offset 8192 || fail echo $PWD2 | $CRYPTSETUP luksFormat $FAST_PBKDF --type luks2 $MNT_DIR/luks.img --header $MNT_DIR/luks_header.img || fail - umount $MNT_DIR + umount $MNT_DIR || fail + echo "[OK]" done cleanup @@ -454,3 +459,5 @@ add_device dev_size_mb=32 sector_size=4096 num_tgts=1 opt_blks=64 auto_sector 4096 $DEV auto_sector 4096 $DEV $HDR cleanup + +exit 0 diff --git a/tests/blockwise-compat-test b/tests/blockwise-compat-test index 8db91c9fa..0672ca216 100755 --- a/tests/blockwise-compat-test +++ b/tests/blockwise-compat-test @@ -80,12 +80,12 @@ falloc() { run_all_in_fs() { for file in $(ls img_fs_*.img.xz) ; do - echo "Run tests in $file put on top block device." + echo -n "Run tests in $file put on top block device. " xz -d -c $file | dd of=$DEV bs=1M 2>/dev/null || fail "bad image" [ ! -d $MNT_DIR ] && mkdir $MNT_DIR - mount $DEV $MNT_DIR + mount $DEV $MNT_DIR 2>/dev/null if [ $? -ne 0 ]; then - echo "Mounting image $file failed, skipped." + echo "[N/A]" continue; fi rm -rf $MNT_DIR/* 2>/dev/null @@ -97,7 +97,8 @@ run_all_in_fs() { BSIZE=$iobsize run_all $tfile BSIZE=$oldbsize - umount $MNT_DIR + umount $MNT_DIR || fail + echo "[OK]" done } diff --git a/tests/img_fs_xfs5.img.xz b/tests/img_fs_xfs5.img.xz new file mode 100644 index 0000000000000000000000000000000000000000..26bd54c4b3f68672f4fb14ae0b4b511c3c310910 GIT binary patch literal 8380 zcmeI2cQ72@+Q)a*u)2-t?5@59QKE!cmQ|vQP8Ja*dQJ4YAzDQ5LPW5#NRa4lh3GYU z7d<4Rw>!W0&inuSyEFIBop+pn&zyPYeCP8#-{+ipF7Emnn*sntKgK_)5Vf2rgoK39 zK!B`(zg7>CbHLRVFX)>EK#&$w<{p6Ue1rT{pUu%WQR8fRI$!o!T6KL$gUv5l#+QCd zbXc5E!UZH(gh;L~P#*S&)B;Q4XF|K+;YG0|93nK2VSHw@ED2?3`<(AfOzp`C0 zmp(UHhyx)|cf#3$b4soy?MW1 z#c5;Pj94IUxT55F%sO%V*4k(1<@n2p=sEUyt%&sK*R*TiL-nm|v~J>0?fXz^>WHr) zma}~hp5jRox`qoeVU+93N1DSyuX^$PLim$ZB=zJ1M| zIeAn;8t*ittwY}vT&eXtDPl$n>>cQ5w)Y4MpViu$o9Ufu_XE+A353rjDLx1gIpb7< zk`&aFl|=aNAH-(!LpH;?fxCN9P4)AiKv224KKqb<&AVfdrb9F4k8EDvdW`ZtTm0@v zHr3xI*o^&Fyvn7Vs&o5CM`LTPU$~Qy$&_Fo?ujIB+cvs=tK>y$3QoX@gZ-=x106yD z=!b#fNWL1O%Qgw- zluV^6gyn659~o^|!lb}`VMhUt4JWP2`WJWvyuSa!hBb`5w?){6)sg!Y>!Ugkn$_oQ z8NbC3dl%l_hU7kG)Z|4SdtH5^F8?7v``ODaB9TkX_SFYbqwIC*M{qi$9aT6ZYhX}# zw%1jopDdC3f#s-s?6U*5w&}?%7)b;B4My2J{c-6u^E`xi9SdM)vql8lT8{7Yfy*OY z`P9EsH1N#l_WV)tnGIjRxZVrQNjT2-7LqD#^$%|d5&XuB>RaL8n|bu0wOhyT_nVKt z$BLtr4!7w!E0k8c?$XvS8l+)mJV_Kl>Qn_pU3Y92cBHLBC8Zw{-Y5s?%7R39MQwszzl9UOI!JIh3;cQI1!YgdP)xgX2n$zQs4@XP9j zP?NsctQS?a`=uI~!;eBgC@0C(2dbcrsYs2xQ4M#aW8F8bN+1=r8SY}nc;DkvMTF9W zB;uZP=G-ns_|D}zTD+Qyq6K*BOC}Hz~i;U@tH;)o9 z?ZilzF#36?;IpW$Ir>)}e2`4>>@>)|JH;Na!;B3gceozU3J$PVky!U7d`%?dI9uQo zwArAtV!p$5lY*c49^-g(ve9Q6oy?B~VVZJ9x)E~b3shf(mvr|Ji{5_PW4XMWorl7u zHg0mz?hHHPWE{rmZ!qB&9DD`Y^B?Bfp8*p5JTI4=gE{hAiyK*gEosX2?rj{sAq-cj ztdkq&>=G6K+I>T|1a0w!18=G5G<>{skY-Cr>}X`kB2EZ`(P>KlzbO)P7O6 zGPHS8f#vg@zh~`v(8+O5ZC|LUI4ugHLf#XXBJh{p@A$=JEVrg-N$=LC3YYoVx5AwT+&ol&qD+6;wz(%h3WoT`b`EZ*k{ zOxQ9rkavpga4RhvnS!t%D95nPxqx1RYZ~4bqzc!%81D6N)}+=h#9n#&I)35ZEy-+& zZmiE_&L{~GjO_p5J-Ou$sb2LNx}dTnKyw}$;VbD}0F)jn6&i{$z8}Wh33LGRoF^A_ zs;^j|hw>1I`Sb=2byY#Kde;DNi!>M4bb45in(TIZz7GlYW;ujJ1d}p8B~##O7NIk9 z8;;0el7P`#ZM)P%hIMm#=FJNmD7dC%W$60CYv!Kn1ab{AWo-lS7U&7opI`WQI{MsI zOc}>c+Cs{$(B3eC=&`3{5ZTCcP+C^7tA2oz^ZZw}mLTZq<(CeNd4Ow~6P$UZ^k|oy zoy9e>x-cHX{0l%+)ft;Xlk`e=klW{G{hzAAX~A~CGZ6(V*Oy%r#@|M?jrDd6tl2fG z&AxjYNb6V)*uL?4m`5wCISZ15}T^_ur;`Q@l(^42MD_pJ}@%WuzZliuJ<9)^K->y^{b7X2PPj8 z@cb^5Q>iEKqe$H+23Q@<)L-7TfZJCEanq@v8o7eS=Z0X)>i;}fpd=18biDVFY6R6y zr84>amJy6jGYm{qSGXmh{r&I(OgK2i_Lz;^PM~3Dw4FHen9d8%MJZl1%B#~ISuD1A z&b(Rp0rzTn~1FP9U16;>QXzQc4d>{hu*xHJlcX0kVT9S6RLnV&lPr5Am3xgE^IMbPH-*QZGlFC7Ud)dns2RVEyzrgDvL) z-@#xAy@!XR6~Br0Ck`iITMOCZ$>&o4w*7`Ajp)$FHAMv&-|0%&?3M~OP(OSyQ(F*u zIQEOk$y6($1mUk;4qa3>9Ypr}+iGyB9*@XkP%p)T&lz}!k)j0 z^j#H6(E)!uS@1m~l3rBybNyj|!2ukVq2;1uNiR?6wjBNDtyV^lf<8@nv3Tan6I6zB zxG;Ae#(N#QrKIrO(;C`$>c&VwHFme=sI}YEQYN}y#E@@rA79#Z#P`TAQSe3zz1hpA z=Vrw%b`3HrdGH7v^hpVA5xn_8i)dyMlkAUL0RyeLs->tMJ&eeWY#Sy9F4RmF@_Bbw z`X6zMCN!%s-yp5#v1xpSnn*Ied58a1L4XF+l3OfYz|3-;1>FD%m0c80?$iKB23 zOz-U)*Oc)o{ZQ`!cuz)vYIuQxP|_vUKqkPsggZ)wbUJ5&*A;PGg`jkN-=-?Z+t2i1 z7qYU5us5fTz$6y~T@$i`W8z^c?|$AF_0MQu#-=>UJ#Ds*rIbusU**i+#_AyV<#*C~ zvOhW3g;x%K4tw{}m2|zZeEoYL<>&Up{c`Y4Ss1&E-t$0)y1*XNB{t&1u)X(TA!nlj zn&BFwWUJO4S*#pQNQ@clNyt}58+Lt%Vr{!Ht3Jw}K()zJmkzl(XIwLA5Hre)sUzUl ztNJM{CpiaA^j1k<`=BiNLQdifVErgrPwH(qwh*I$C5LTkTag*2_^yc&w((2tj91xm z)7(bJwAR!%4!Te>sAr6+=b3oB&+bAVPZ*+ySPDeadbU!=4U!6?_R3ZxKpq3xjNtOJ zxsXd7laRX+i~>(V_M8mhH=VHucJ8Fv)0#3$Md& zR_#EyPie|14BI^g0tKuBqb_AJ|A%|Iu{k<;}c4&kj#uKg#zoh(u9vmedG1ma3I z17y8zQ&9{}NY~0W9@zV1l9e?;b4f%(3s!8JXqh_2WzsjYDRqH7`Q}JY0U+$RyF_~;gkATyBwd`I;Dub1iJ}-vq%AE+v(@!i@-mv6 zU^brU88>bGCquI`$<<(E#CqZBPB;i>40&qRe@0Le z6^6#d3=;)tg2Y!syG_9~s!PEd0s_Nz8MLRyA51s#(b?TvnuUqCx|PYr$O*n+E%i}| zggiWUIr5HWSjK5!lCPynEbfV^IdzsuVM?-7uSsB92eTAE#xvd&WQ)r%kSdY`dq9y{ z(uBaEF|`zulDOk%gJ=nz2eq+O9k~63_|y~0nLM&AO&nX_{n8t1ry;Ye13%^k9ue1* zco=WWx^A9#&gxp85w`tVKY_z*GZ|<6W&3wu6zO!~>1w!#GAA=Zf{1?KX{Fn^gV!6| zEchr^aSbxYXc8XO4gAheBXsD9TA$jsM&Xc2F8nZv^tJMeC)$h%yXO#U2>^d#m`w-H zfZsLm)iF15bJ=A)ZjDjBIpI5^&NZy6qRrsc_wwBGZV-h{h7ogUgn7xwKFv!{LL}^< zH%H@YyN7}6O6#YO>?%z(UqJX~(SSk@!!B2KZGEffCGomnL7LO)lUwnWB-&y5;Tr-J z9(SGtp@>^qYJTU;b4^YQ=VGN@%$<;NyORA%894w{_M2U!;vQ3aWIH*?nqY^Z?`K(c zfry!tTJ)0F8c`YAMf=`CwTKox!*GUz*##GXSP^V0Srmm$oSE1X+HjOo7R&fA3oh=eeT(hMDJ*_n@xL;MxrSeO=qNd;UxA zdELL?)*H04t;`(EtDd literal 0 HcmV?d00001 diff --git a/tests/reencryption-compat-test b/tests/reencryption-compat-test index 8bab60525..7a6301e79 100755 --- a/tests/reencryption-compat-test +++ b/tests/reencryption-compat-test @@ -214,7 +214,7 @@ function simple_scsi_reenc() function mount_and_test() { test -d $MNT_DIR || mkdir -p $MNT_DIR mount $@ $MNT_DIR 2>/dev/null || { - echo -n "failed to mount [SKIP]" + echo -n "[N/A]" return 0 } rm $MNT_DIR/* 2>/dev/null @@ -242,7 +242,7 @@ function test_logging() { echo -n "$1:" for img in $(ls img_fs*img.xz) ; do wipefs -a $SCSI_DEV > /dev/null - echo -n "[${img%.img.xz}]" + echo -n " [${img%.img.xz}]" xz -d -c $img | dd of=$SCSI_DEV bs=4k >/dev/null 2>&1 mount_and_test $SCSI_DEV || return 1 done