From ab54211e63061ee661f94a6b6110ec254f966540 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sun, 24 Dec 2023 09:34:32 +0100 Subject: [PATCH] refactor: use smaller image for category tests --- .maintainer-scripts/audio.sh | 2 +- test/catdata.dwarfs | Bin 174714 -> 174057 bytes test/tools_test.cpp | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.maintainer-scripts/audio.sh b/.maintainer-scripts/audio.sh index f5bad341..39533c90 100644 --- a/.maintainer-scripts/audio.sh +++ b/.maintainer-scripts/audio.sh @@ -3,7 +3,7 @@ set -e output_dir="$1" -duration=60 +duration=5 for bits in 8 16 20 24 32; do sox -D -r10240 -b$bits -n $output_dir/test$bits.wav synth $duration sine ${bits} diff --git a/test/catdata.dwarfs b/test/catdata.dwarfs index 9635c52238d89a4c7138685ac3e475ad39597522..c858263876991798273402a406d14010d1c544e8 100644 GIT binary patch delta 7650 zcmYk>bx@R1*8uRPVd+lkM!LI}?oR1$2>}5ga%rSXKn5)*_a`|{`a6+C ze5<}zRvAM8MgI3mz9Y7H)Z3(th2i0Yi~a;j$s zSwwR)#;Dk^7!ImW?z7WS>p|K~d(43z#F|x=5=aJdI$%jw?P`$a1b_+IymVM?4D z39_Z^2K^Db7Kg9G5vlFyTOXhTnm!wcL~W16Iq(huNaKZ6z!K2{f!uP;;8_alHD5CN z>VAbY>ZG5VHe75KRL8gUjNlCqjH|QUY823v;+Z-seRQz%im{F|_?+W#A2FhRo^sbP zU$*-LPkQtg;i^vi^}8fMr|mL-UxLd=*)fEXm;G$ZU$&Cm^f1^z$Uf*uObnLejmOKu zd$3c@&U@Xleq%%Y$d6J5t#X4hM8D7$-4#U*R8b!t+NAiPht7+^x;DYIfH3~W1V{Mp zBYeeJCLfM`fpY|wGvqbG3MJspQ}tzZf0JIQAd!w@W;EFh3Jl<+eTDjmsyCj;dF2Kz zQszTg0WAR94#Qj!esMb>DGUd_Q8NQidEV0>e@HyTva<~a?Q4OFX_guvAKFJRxz-TA9x&keUWT@Wt3Ia6 zB@CX}$jek0uUsnx*%gvI@`6>p7z*U=dg`9nJ#0&&rAxBHq?v8NAJWDXvi&(7*Q3pKemP>*i)XGmJ}1nVt5O@q z5&&6&EI~!PknbxfX^p81^Min9rqVklLmE@q!WH5Maox9G$nu5oR+8l+hA$C|2X&C? zXQO5Ugp}eH4Tr?;1HyxC;5H4h%7QU-CJ)99(MxSGW^jF{UyG1VLa&tKCcMIuIoa)( zcuU-n7&YcV!~7>rR?R zN9%H{9_=%s)wA)RL#wy@4vDuFpuI2QpNs;eM1I|nEDFQr<lsPO25<#NV=I_L85MDelGLz8P+4&j)3MXvFfnENxOgnM zqw8&COZ;(k?!9RWbMDUp2ZHNWf+9?DhfjwTr!v+UPg-#B1mh$|JIgU( z^GuON=-vs8gi+i-&l$Ql!z8k#e417JaEX}IuV}||+;rl_#qiFa?3Nvs3RW8_$VU%D zXerPqCY=bW>1x!&SIj{utfV&}5WXyfr!U9j%5FlHUUJ{|lo&IacrzK4_hvGvw8lWJ z@XqBnw8V2355CRsZ_3KLpI{~i#mzxTr#3i1^H z=YD8FlO+T}txUxQGKA>*DIuo07TMzSUNyJkI0oou9P^mu+N{D!DE>B1QO2!@D)z9=n ztIS;=zKVzhw3#xw?wUi>ekmAHPo51na@J%qQ^On9;g(_0gpic0`A@v<4jvM zR&QfpFV+=LJe!}RRhbcIGq#3d$FbCOW3C!kSgT6I~~h|9yi z(Q>*xsjmL%XseR<(~a(AKT~XE1iASw1#=yy(+4p+cch%*ALd8>zcftd^qUoPdo~=% zNd7e5`AQL!BOsqr2Z$_h8aa<{RJn+Ju4iVoj6&={?-ci-=Y~N{(nW&F|v~idJbb0*JI3; z0zB~K>1+*`Tpxt5E;EOPVtU|PXs1}my6_D9GP?9A!o@5H^n}Y#o8V|jJ6TRbBmod_ zx6F#7#<F8)wHeK|=5GOjn&+g(zwExQf#0XuyHxZ-~Bdr|Qdeaa{Cj0E$u~ zqp1m0jP4k{w#~OUCrXHr*H~5o5!3SdSLHBQ=G&m04%=X5_`A&B72E^2=BS6>r|v-OsaWa()Oy@+^S%8Oi8ul>T?;3O_9t*FJT6@ zxBoW4)yZ0TwVtphI&rpfNb^8y%M+()dY$3@({s|>ZlAGz2KyWQg1_+%P_JSTm9Q8P ze@{7`q=>y6BT4q#wzk&O!_O6M#53Uc9!l8vtWe5m7Mz1 z4u`*ijHOlJ_yK75VnOtoJV5Ed$GTIR)c7LQ9fW z75*ORSOg)JRKSZ|9#zu(UrptMmBDmuG-4%2Y#yFjQeB4b-=Fs+h%#ML+!PgiAF`!f z`xXR*GIomjgJnq&c^#dW`@+sP;9+o0N!L_3;8qsd(w1JS!eMKm`lNP$sZMDtp84uT``d>iS#Z~ z74jWDS40|pa~Mbh36(89((krJ=bJ*!e8eNP7H;pUxEyQYwrlAo2pO`&-O!!)VrdWl z5ycIk<;cEiQoZv%w=eePNe~gc)3FRu>EBvEm`$;KKugYy3 zQ61IwN+|nxc(IfEooBCDNeL@2+8351oPbx!%ElqnVb6fsitD%2k1uQ+U)5{V_G48J z!-B$%CnqgZ)Yb}HOr>WY@!>XdKgH&7QA$J@*xCL(Uv%lZJS+HS`y{5TldqJWzY>2) z=9{esOy8-lmER4mR>R#??{u73H!}k#&lxKV)(FwBtkvuB&|Sf#8Zv#XoY=c?7rc%L zgH_kwU(Wzv@?ImnANcQA?(R!rUni%tDgCR1MLRe>61+{^f6JUZoAUOiC(7Py_4a}z zBbn#mv)3-~&9NW;9FQPRO4hh^;bG$lp{Xyko8d$*ExTfmVhq!|aUEGgg{bn&xG^ke z<#i)CKzN=IkTp{^ zXzgQr3PH?ay}al}y8uXISgY-wJqjkmvYVPJ9X{>Ezfl?GqNOx1&c=XZpE@-W{$}?tLVkJA(XgTQo<6!k zKAvHtEu4BaAC2lK*4b9Lz$(_w^BiF}_eQ+bDW|=ar}7%G!>Wg$9rx?~7p{f#SJ#XW zh!#x?N0mYL+ndNUe#|%si&cfvQV z;mm|N?70<=@Yu46bJBbn(XK`K`biokF4M}pz?!7WT=l(aeJ|8hg+?nP?$kai z0BdVi(w01N3KBUKwM-xw*RMRXcX>uZRjPoq)TcZ{WdEVXFTYrFmhEk{;ha*Kp@tMO zWMR_ZX`g`lu}cnZY*13OVnIQ>t~G$d0g3V-N*94xPtIeCil+EkMDsAE6$=QnDx%?+ zViUKAvJ0OL5%Hn-*~w+2%uosKYC_W)j|e%XqUk=HYjyk>B$Z{o?29TA@_onjWhx_= zi~+~k^|{gG5}m8oBq6!e3O8*Or6e>w?aj9CQtfPAtg1a)Hb3(UbD>O^rCk8OKQ1G> zlq!w6oQ*`GG)}@U+#h?!xbPrqoiid@O!LT$=sCttp!BiWOcBIZ*f-#0RBgVOvIGVb zmk`t+UhWU|yghkvF7ivrwVyDJkZm*V#!$ygZ_M1`3oPZPpJ*c6)fWapWmgqq+%T-* z(ahY`H*vLNK-2Ixv|erf7;rpTBS43VJQUvxP-_ND`OtDU*zT=uif&Q|9zFz!r^7Y> zz6~BXT2}_ziIM_KkyiD~&Q`~*s_VLQUNY5PVcT4v<~e6aE__vK?#S_RlE$t-%!UQf zTX4@Q>T~YAwmkX;2(ut~(qH^gy7}pM|1IjH&|CklU&{k3KZcj%ZviGO;a{E#o^or& zT%?s@QYLp6I=#`77~_N5`H+%>V{cCT1}z6B zxMlL+C)2rEy!;v6-Zw+hM@gbP9uqI5FXc4hX{z`97BM#78^0-;S>Q4X5tpe*k50D-A!+}NK&()>``(O=RBgtuo z8e^+UMtkyjuFs_5lg8;Osx7))hs`ZD54|$4nGu3BRGYn9aMGOKwXwk7ZkVl{^UbqM z8iXaD=DktJ!(BJ?=1WR_h{$DA5+ixsejNenlSFA9M!5$ zYKO$VQi@`(CXS6{9JApOS5z|GV+2O=jl0qnm14m!F`Ik*`p+|H zIyS<|Q83>b_NA{|n9LLMxk9UQ<=2+nXY4;$j-L+Wx|Cxwh1_9-|$+UG1thWKjz(L*|%_G4T%=d+}_ z*dICaMF1}(JxX)WinWIZK6Dg@q;jFmj%B_J^payLC>e5NzI&RupJ44F#oYO!yU@}bGeY1a!KoDNgVZssiYnyAE>zg-<0{qy=82v!+8;YxTKRw*LHt+8p-nbWS0?q#x z_BOcJmN$z7PjS)FFF^eYlvka8FLCcaG#+*};$D0ZmDMEuqC|dtOqj$?e2gPq_Zrl0jcAoN8c_BlNha4+av+(RNvhZ+ z%uK&=3`Z$fCj-B=n|6r9-K5CeUCJe8vk)kHVmHv((7a2PE1;c71YXY1%bhXG8s!>K z#7%@~KvSqRb+mM~R5_H`tsTE|Seo0|0wz>%FvM05$V@dSf17sDY_LyVod znZU25EcBw^>?%Ucq_mFXY&s5VY+3{Uk&?XwcmnJiTb1+9vD*o_?w&QG*(R}UUI2+8 z0LGSLhJezEQ876UAz&Fbu(fVm)uWHAFpxr#VDU7Z-ej6qpf$y8A((&PR4kYI-mlD~Vr~KZ&D{0QY!*!r#b-@dN+0$t+p*AB2#wzKUCIF!zSS1UV<=r9KKd z&YO^}IAsiL!YK*N=#U!bGyUi(Yn50|q6|jGOwLpkq3u{sH797*9!h3C5X-5F4lyT& z6Zeyytf2XuVxJW&1Q@nEIf{wWlw>a>@MNcb|KLu3wISK$Hy@S>sJ>ztl`p>dKt!D` z7({Gdm{NXAsxryEuInEH7U+%u-$6F`dQeo==IXry6+#_KskwclVO}Zqz6#O;p@Pc$ znir0)=mxj4qiu9FGwgqWDXsP>#YbZY@w*Dj49n0$8G<+G7Uq3Yrov@DuP6s(<nV;cHIs;F=4RlHxdbB(>2REjgv+SkO6 zbCjybHqYE|Grn;lCKP|MA2?Zn=h;f5{UhDXgVf3PU1^fLwA=tI;O1fY*vg-ZiKa$j z_6{Z9A|t`2SKR4HGa+#=@CBp#)=hO8v4jpd9xeI zkYB$IX?~hnvW%g67!kU0%pb&xr&INGw~l+J>tHLTgI=~J)P=z%ioEJZ?0(A%Vemvc zDAfubi@bn1Ve~Z20T9P5J0s)98{ccL!MKmjSB%BPBcof^mh~4PY*ZVG_GA>U+Wm|~ zw(N&zn_BT%u5a@*_JlkRZo9ZjN;_6UFf4}km9trH(0vq8ZMQ6hp9e%N1$jR0(aQC$ z$*&VSj3F@)kTfvV#(O*qVQdyu!lqP4Z`Fo|a@)Pt6n1G!0W6>Nk$naqV>kE!i5Ri5 z&JmJC9;t><8Qe$7M7HTD=PVQ&=D$Ki_S#qGX`hF&YtzJUPU)aj5X~8lJ0_;cLJAdV zaLhQhd4AP{tJWgaCF0HtT`Z{xA8=1`ECv%7f?A>@RY4Uorj+d}39aoE2_NXvf5qyV zG)qNka9t`a0B-&g?-5*@H1v|Uh7YW!SBwd`G)3+EYr25+*Q`nAmjqknFF02X$LL3% z7yJJS8LiLh32G#5vo`HJiDlD4g~Ac~x%7|*i=F%n>C<^vLG&^!gDwUAHWF*Uzcu?i zDxb(MDHVj3Q5au0ciK?Av)PwdzdHeHX<+VL(jqnncr!vAvuFClXXX+ukH`3%1FK%( zaZ-nP>5vZV4|cdgkK?rt8e`*CXdYb|_M^GA6)s{iW>)G`kL1PK4|QGW*s9a>hktlP zHrnmy^zL!|7`xs=nt4Zv`f4oVs4V)npkbL!6rQ~!Ib=-r+;m}Ef0pCZ3)7EN%-eVd zLXtQ}fG{8Qcbi1^@Qo) zUDG@jFia+zb8b&3`=hk!c&Lo)=EM^-pt?~8a*aZ8D5wi>l8yjpkc} z*3wBdG_R>2h~CP-QV*9m!dr6XnRVc&KhG;T8)uLmDwo~@2JJ@pc{QU|PMt^Qez3N4I8Cav<}O zD9!adWBmt1`Y#JqCo}Ojylv(4M%9@gLj4LnT!}BI`16vCYScJ(qVJ}5`Ok7HR4axf zIxZSH>QIkCOJJ)GK#)0!2n3eigX&#IQp0}yItG>aCg7d=u}W~5;pNUM2~R`4PH^{*@Z zckoCeRg^)BA&*o|8RB<#SF*s5P zF7m4a=#UNwA{Ep^>Zp&D!w9Ln8PXrtNYfqv34lPsp2&bm0@9>Rq$br!F@}(?>>+(m ziu_ST!hqC=9cj2Q(s~HeTMMM_0Z8wkA)OCJIu-F(;lF#>jz$KE5|J9E{}T%ooB2;{ QP*TM|!Jy5`f8v1t4;Mk1qW}N^ delta 8282 zcmYk>WmJ_x*D&C7fJ1k8Hxf$c0R*JG5owT;2FV-g?vQRdG)M{}9nv5rDG1VyG@Q@p zIq$o^cm7;^&5wJ{J!|hZv-a#wV&2VS)}NCC&7?gs=hnrx!!(#^v=L5y8SoGd`La%W zH9rWxLuIo_0K=?kl9^}>66ikz2}FVjK{9w4c19b-ec>?TLY=JZsl_}Jzkp?*#-D)Zt`^b=UA7kvs?Ic%yl((A7 zoO1&Tgr>oZ-^)=(N5!+}>c5IisgIhUhy1bN>#VP_^xHz>(f^I&j2ABdM8CX2RTTSJ zvMe+@C@C-Lg;XQOu6;LlQ?5J~Pyp_^k9RQTZtaAXPgXaZP~?4s--;mOBl#M`NdkmpuJ%%$l}{*kcQ7IhQdu(Pt2O(O!hq7N{Xcs9mB{0ZzH zy%IE*mn!^}Qz3!xdM@x4>?{SQHvfI5SqZ0B)%ww6M0RCzqqy-Ug%dF#?w#}-{E09n zt2k&REO+)V1D*{W6hcN)AX&Xh!hCI5_)M;dTdVj6{eQA*;J*}5pwF*J>FO&) zvH2tylCYAROV|$s@j^a0c8h9QT=v@ft8mz0rolG@aNRkxM z&lRLi?dDZV_#SAwddpupxY;Ukj3-(8)+?L#(s>g)9Gfb~!-IV9B-H4|^9>VFpk0;m z6wO3omnd-#9&WIU^L=|-AJi;jU_dPvY!+5Nhr)opYzgDW`k%G#|KAEoe+eN2p>8>d z@iiDD_b`+tmCHoBeuLn;jrEx|ygS|v3!&_CSh#EK=JE|HIBL5?rT&a%W!+p$CtOzd z_8xBXE(<_11Q~*iLClMEko#Ud!xe-2b-ouz>+1@(h9N)L!pq8H+1jov3oh3#TQgDQ zgp$EU4ewcV)k(;~^sB$Dq~Ub2@xz0AW@x_SQctgv8BTbOv9CO{#{S-Qbtt~BNA{;` zrmA}At9WITUgHsLuY3@&Xq?z5?Ej&nc4BvUWdoqfVp+{A-%Inv3(@n$8x_7)isc!A z{4N?g$mAPixVr$Dc{5c@2QEi*mf?HwK)gWsTKHJcEixR=_CQElH3v`SLE3t}_%Q%& zCivXWMngtgGHqFxM3DYyYU|{A8CsCu9u<6ZqeD(szP@BENwjxMMHDSQ&`G&+eCBst z2}Jt2Di^nOuJSwYpw|l9&A$spVsWg_tiD#w9>IV1QUyBDsi9@i-dKyGpU#yXB){(P zyQXFNV&bax$nROn6RpibsXepWya^bZK7FZmJn_ZEXwb#OcKm1CH2-l=*^{jVfk%nwQrme0z8I4> zoPF5W{%}aPFv&KOyW@=D9R_yKcP2ldk>H>t9!yy_0wl#Bpl3d-bTTe% z&&pQt!s*CeniE2$B_gFIz^&2}NL0Fj6!nKbC3B3B$Z;f+&@dzG^ z3r+ss#=?}crB~Ang8zyJ?ccHS2u4)+e~*n?tur+2;f7 zw7F^8j27g|3O1_9BMQ&z0DrX?2Q>?fu?I9mM21ZaTNKzZXrZH@(_ zd@-tMETJOeQ6A-tuvY9wnKe`~ucLfg0-pCT3%vC=CQOjmGLFv49T+huVK0}Y&O3@0 zCt}*E9ERy*jN;IZROGwriF9U{1*hvml?0lR^E1>-X5CRZUo-02Y;omCH&hMOzhue{(1*FBcT|Kd}93FVaHhE6}`TYhS+Tdfgqal3%ukPl32DI0uPuUq#p~;UrSBrc%w}fyx0~u`v9VAEsk#kM;@^Img^7IqsLFfsFXE-XohZ?I5j6Cs~ z``X5$HL9#{k&KMczq~>Jmp~%K|385W!+}$DP!ky_q9R49eqPJ*>*sf-0UsxN(SvY* z==9xu)JY1i;bRtq9uPLjH=1!=9C?_P=`;2jbfQmVa%4h)TxhRcq$#6pkMzb6U%np~ z4JspMq=re46UTa}C_tfAY|JU9iGl?teod;|uEzP2m=lW&)wAvSnKVmLv`!Q@G$c65 z+pzJu2E1-xiS=HhrB0*M;C9unG6Q(!GMFBiu~7HYEVo^Q=sxrtuP-#=ibUi*>U1~W z#_KNO`R_m*uF8wM<{w35Svta(7EzCcsHS>v|D+`dp&jKAuoFpP*mtGK!z=Es57*BE zw;wq-n$o?cG~qE3nhr4^Sk}x+IDQJ7brFbpnUUU?1VGmol~aA^Nu@G>yfOx;sF#2E zO;Jw!pZPQ@zt-#hoS^StjCU`9Hmrp~gJr zb=o4YGyJ#@m0O#%h9n_pGGmDq$mZ}2Ee;xe8_a)T|Q->M{4xt%9uA*TkH zC{XJyPEoZ3X;kh~k3yB^i$e|ejb zxOr<>vH-UyETp$MBt$tDEG;~@&uA@c6HXu>783=B>s_0h8~1ArQvw2Ntg7AmQL>M- zeeG{0!-sTA=_k&J4!vzOGukY+in=qpRPEt9=sEmJmeq#+@cwub_ukmZ-iW}=g+SuU zTTS&bOncNgCIO5=8t0xOaJgE2lCUgp$1YgvPZ(0Fd=&gI;a&U{Ys+RQ z8ad~e$n9ul&L6WetUxKIH4VsHxK*Lh*loU>De#ctia0@}7deIJnVW9@4?fZ!lUaYV z%N0I%^*rA~si(>Bm%n2885DwJ*?q{g)?f;C<(z5!+#x;3&OR<#NY$WPP%fx+%<1Q} zr6y95A|%sp;?rlW{zj>|avNctE*b3oNEJ7a_9mt}Ossyj0Mxbg6+z3m8>bTbtE6wt(ObRaxka`D}u zHu86nFK&pUry1bk2JXP)hH21W89WA+{r+}z330H530fkvZ_b594Q~afibm`vXR8&k zNNP^dg?>ef)R(;~%x6irut3yPRrHZ(yCvCQl2 znah?9ZtEPQcFJzGv#GoHLju6q&)?a-8&^UOfixhvcH6y-@LKq4DF0tyOU*7ajdZWj zn6>k2z{6Re*dmwioW74Uex}vriRQvC&3!-|!-1xYx&E>UknQ4mFO1G0eWd&rh z08HUtwq7G8 zI8PgRp~zXx9T3LclttH(%ps?1ql${DR4;}q)?EdcjWLVR+co`F!Y5V<?l201h;&dHpkC*1J`-Z_ubvXjx zDGL+{iUpMfJg8Lf=;p42cJ^X^ybmz0G>kItW3`tDJ6VwSuW)mx$2t7kf}jYpY7Pqu1er|R$IG&)HCx(Tk4yr5tcwLy7598K0wlBG}Wyq#+MdcQ?iP4mqcg?h% z0}XA?4^v(`$%T)MhuCfBHulE=NHArlB(1Dxo2<60JuDPWxKTW^riQh)gZ-N|Mzxug zN!d{p*RujG;Qod78`qa)-6iy_PeD$OL$KekxJur=?ZVrU8S72V5LhEO49iD&=Ac>oN6wV zz1*}tv2YRMZ%q<_NvIcm^5e$0;FG_m??lE7@ISSSd&alB?e3Sdj*H2^5$=c3 z&S!E+xr=7JL0zMJWZ;!7sG@0tpk5vzrg zG@hpyaaM2r;waEFRRoK{myukL+9lJ%+bnbxs-wq*+GA$D4z%$-CzdU-bXFYgpmz;B zwa!xZeTuFdBpQ~SU&tmtV5BvZiTBXse^xs{NWwI9JJ^6iH0~e3GAERnN$dKe8kZ(n zZes}$kUaq-j z1PNUDvg-OxTdFinAMFD9gc>IyShe*;KVNt4v-4>y_X~FsWn+sRI9k4|{-a2k)6t=n zh2#qI0lfp+XyuVhAhixI2J{Kv?E0rWla!Zcsq|)6s9!THpYN?;#(#d;&pU1 zCbiakFK&`;-(grpKzmA%RsGb|^F#!myGTPUOk1x6FFQ^epK_MFirVQ0WEDJ|6fdsp zm;$BF*2nCj!LrBeifTbmOTXw`$3&qt_Jpkzf&iT8{W+HU(u79c9_LWvi%fm#EaAWrRdw9_eARmM=x2o9b(fL#$ z0c?IX8;VYpGTpf6< z&QXagr99z2=D``mJRQ}tC!_A$;>*{CwaXFBd6QQggcX6OOcFDf-}Top?p$|xKO-L- zys%~rSzrDW^noX8IL9O(Y0?Fb+a=q20326!BxYvD-=>l~5Rz(0hNb#t2YR3xN?F3r z$O-93ji$);9B{#(H7!}_8^kv`VnE>pQPNDB^dWLLVd%-y7*NLFX!0Wl^-Aa;@zH(- zR&&X~V=0Mz9Wlr@-;1ttqsEA-(x=jK6I>Dcd(9TsV+?8>_2B3<_470t&<>~P0ZCFB zO!vw?14lMQpG1?CZ%QJ2g22i0!Wu9ECY?k_wubnUHS_1!4nACv}6 z=iLPNAZ?xsUFrIQGkNSdB?_l z`Icvp;|H=JB^gKsTgM~%)$=2+5uoyeD2i)xc@SgomXfTI+QWv9F+T>gW-QeMc}&#G zR^tn>ei*&LV(4aJ&HX3Jdem_dP_`8@xeVW%d}J*f$W&V8xE;D*p@8D@E&Y?+*B%3n zkTY?)FXCMZ6QrIS@ShA>-w%bw>v3q6h&{<3hjD4&|7cWHHdoQM1t)_oz<{@e6`p@T zrz`zoc=|?yWUGccdNk97pE9G6=!ReutWB5k8hIo-nQ9&UeyLo&Kq;zkd=yU4HAnMX zY82VGbYZ=__2lT_>mu^$m+Lo&KFnVkmuho%W9qyel_)|;gaW!u8k5`${}N_?063LJIxZN=$u& z_0qTC;XIaTz5lSE_SyVK?0xCi=+CdC9^y{w_63Sd9wrZXMupc>NV=pFKb~5g9K^J1 z$F)xT3u_({kzwH^1wN!%Q1A8KJa?B`$BGGr_9OMXJ>oomYs`qj*8>7g33%cz7KyhH zx@(P2)=kiFukNZ*2BZ?mYsm)hslzhI{numLt^vxyL4SH;f$#nr1IXbh;cjd9HC5yd z*BXpT4cD^FE+>s+-g(yp_}_Zd9P|$S@uFQCE^bIkF0D=!NPA6d&XMposm(29-qw5m zwYJfnGgnn8v*8n%V+Q0I_8oe_5Os|1!ZCDgYE6Hn7xiA8!p+f>AKNon*?U+TNEDeE zXdvOsznV`H36^taxi?=dl1@3W$Bew`u8pR~&cbkpSkz&mD}sw2NbjYWa!}iMr3#YG)Jfi|))UBf9r3A122HD68ySZDoaN>I`m%&VXmLUg& zX&7jq@rEvyNpa>(At}KJY|VDz&eq~ffw-62k3>w$y0cML|+|s5L?6BCWT12$iwi43og{-CR}C@ zstiE2?{a4FsR9R<7bJ`~awIb^ket&PYU9kDZ;d*R(Y z9{5Shsz<@X^V;bW5+S+o-LUdZq)M-75B^dB z;_*C|Rg?DH&0lE7%$b+Y*nj$9O^ZC=C@VG*bTk}7BB4f6qr&3*sE-K%%YTmp8_Z@Iye*(ni@&&tQCG0jjYub5msX#B~3z#ZAO+|09Z z)U|dve?RWtx$bFf>RnQ_>S*NB?sOHjP`}PSKRV#vVaRPz^EG4Jw#&ihgpBG6p#2E< zwn)78&5|ozzYEjnOjrI3-Gk4-%dgk`Pr7D+f8GO^bbG)L;8Wt0)g@C&7sVW)4Oe-D zdYLYGnZlJH#s39=gEL?RT9#22$-%^>am2(kZ5h~Ib^{cIY zr~Ave$-tDBt589?OTxbyj;Y|bWK$&^!@T687-qv37vTakn0zTw=7={SunYl@|4toqti-B&A6)# z5Q-~B{`VnMdDlWVl%h~naKhyrk8J`5coTv)gB)NiS(fcNB3=q;MX*;aM#OpF4Shb8 zY2}4P(B9wDD?vmL52i%kq4x-9d@L!&Ox9)Iet>3?PG+xzk=9x_RSGreAKlqYM+Y4F z?lD!~WKg~{W+Q2lYm$3~7jCUoqIH;VjsCw4${lXgKk=A$8hFjE$JigWKrATmhX0Pi7+}pa zd{BLEURR|W`^B)X-;sKxz;;Yy-4h_pIgY{)6@_-PV(<*jNXpO5pWS(-|Nc7=Cx84w zBmFqL^F9G`=ykB3F!J#sP+oRVFZNt8zC_0ojc>q?jr5S3*-tHgFp!gO7fXY7XrA2V zQVGu4(pXTS{Pv5lD}}?3yXOpV{thwLl2ZGxsq=ggZd2Gvd`42RIH;vJ!`VD8iV+`# zB)%J>hQ9I#$9Qk?=v(`5$fmcUQe>e!nq^ zvN+^jirS}zl#3n>CjWlD+t9m&bG$Q{a%)Pa+0FeN6DFHU@Ck_>fKniuz6n$a?Pw8N zG9vV5Ls-m>u$%|s{(qhw{tX^cgoY9bsi6qpyhJ#oh%j6Op_2i^Vw?X8fNoq66MbO_ zJ&F)24kBbZLwI(DQ0)n!2^Jz5VyF@Re2!321)-lNLMa`D!3GE~Un4BH`i}qzl;DV% zP>DiVl!DNy93gc-!n0k36GVvDNe()M;j9Q#`4RTYAtW$H80>+N$Oqw}FT$O`fAarZ j!+i*1f-M@ML(+dl1C^)zM|2Qf`G3R&xx@Y=2I&6*5mV&w diff --git a/test/tools_test.cpp b/test/tools_test.cpp index 390e392e..ba391cd9 100644 --- a/test/tools_test.cpp +++ b/test/tools_test.cpp @@ -1259,7 +1259,7 @@ TEST_P(tools_test, categorize) { ASSERT_TRUE(compare_directories(fsdata_dir, mountpoint, &cdr)) << runner.cmdline() << ": " << cdr; EXPECT_EQ(cdr.regular_files.size(), 151) << runner.cmdline() << ": " << cdr; - EXPECT_EQ(cdr.total_regular_file_size, 679'077'701) + EXPECT_EQ(cdr.total_regular_file_size, 56'741'701) << runner.cmdline() << ": " << cdr; EXPECT_TRUE(runner.unmount()) << runner.cmdline(); @@ -1274,7 +1274,7 @@ TEST_P(tools_test, categorize) { EXPECT_EQ(info["block_size"], 65'536); EXPECT_EQ(info["image_offset"], 0); EXPECT_EQ(info["inode_count"], 154); - EXPECT_EQ(info["original_filesystem_size"], 679'077'701); + EXPECT_EQ(info["original_filesystem_size"], 56'741'701); EXPECT_EQ(info["categories"].size(), 4); EXPECT_TRUE(info.count("created_by"));