Author: kientzle
Date: Mon Apr 27 19:23:53 2009
New Revision: 191591
URL: http://svn.freebsd.org/changeset/base/191591
Log:
Merge r1034 from libarchive.googlecode.com:
Put a much larger file on the reference ISO for this test.
Modified:
head/lib/libarchive/test/test_read_format_isorr_bz2.c
head/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
Modified: head/lib/libarchive/test/test_read_format_isorr_bz2.c
==============================================================================
--- head/lib/libarchive/test/test_read_format_isorr_bz2.c Mon Apr 27
19:20:25 2009 (r191590)
+++ head/lib/libarchive/test/test_read_format_isorr_bz2.c Mon Apr 27
19:23:53 2009 (r191591)
@@ -26,13 +26,14 @@
__FBSDID("$FreeBSD$");
/*
-Execute the following to rebuild the data for this program:
+Execute the following command to rebuild the data for this program:
tail -n +32 test_read_format_isorr_bz2.c | /bin/sh
rm -rf /tmp/iso
mkdir /tmp/iso
mkdir /tmp/iso/dir
echo "hello" >/tmp/iso/file
+dd if=/dev/zero bs=1 count=12345678 >>/tmp/iso/file
ln /tmp/iso/file /tmp/iso/hardlink
(cd /tmp/iso; ln -s file symlink)
TZ=utc touch -afhm -t 197001020000.01 /tmp/iso /tmp/iso/file /tmp/iso/dir
@@ -95,11 +96,10 @@ DEFINE_TEST(test_read_format_isorr_bz2)
assertEqualInt(0, archive_read_next_header(a, &ae));
assertEqualString("file", archive_entry_pathname(ae));
assert(S_ISREG(archive_entry_stat(ae)->st_mode));
- assertEqualInt(6, archive_entry_size(ae));
+ assertEqualInt(12345684, archive_entry_size(ae));
assertEqualInt(0, archive_read_data_block(a, &p, &size, &offset));
- assertEqualInt(6, (int)size);
assertEqualInt(0, offset);
- assertEqualInt(0, memcmp(p, "hello\n", 6));
+ assertEqualMem(p, "hello\n", 6);
assertEqualInt(86401, archive_entry_mtime(ae));
assertEqualInt(86401, archive_entry_atime(ae));
assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
@@ -111,7 +111,7 @@ DEFINE_TEST(test_read_format_isorr_bz2)
assertEqualString("hardlink", archive_entry_pathname(ae));
assert(S_ISREG(archive_entry_stat(ae)->st_mode));
assertEqualString("file", archive_entry_hardlink(ae));
- assertEqualInt(6, archive_entry_size(ae));
+ assertEqualInt(12345684, archive_entry_size(ae));
assertEqualInt(86401, archive_entry_mtime(ae));
assertEqualInt(86401, archive_entry_atime(ae));
assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
Modified: head/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
==============================================================================
--- head/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu Mon Apr
27 19:20:25 2009 (r191590)
+++ head/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu Mon Apr
27 19:23:53 2009 (r191591)
@@ -1,24 +1,24 @@
$FreeBSD$
-
begin 644 test_read_format_isorr_bz2.iso.bz2
-M0EIH.3%!629361M#:2D``,?_W?__6_Y58_GX/__?X*?OWB8AZB0`,`...@`$0"
-...@0c``qp`u:!,&J>FJ>2:CR)^I'ZB#3U/4-`!H:#(:``...@`!h9!d!ii-$,A
-M&BGFJ>34]0T!IHT&AHT:#0:``!ZC$`#0T.`!H&@&AH``!IB&C30```!H9``!
-MA(D0DTQ3T3$TVA-!IIZAA-'J:!H!H#0:#30:#30T;1*PHGAZ"/F;E""L"I6"
-M8W&#'./D%S=_T4T96&+...@94x&AL;:`Y+0C?:%=B#:8`:PP`2WF"20!EXL)6=]
-M8=A)!0Q)($C&$U#8AI(&QL2!"10P4^8D$"0,8$I-.!3R8YWZ]Q1./IDR^VYN
-MRJ&76*,$3PG?U(,=C;I20`D<&9/%5ILJIGI0(SWP3KRID6=#1MV*A>)(*B0$
-M$E:><!0D%K$G(WM("\:="00+`OCJ`Y0K(4B%(:1`#1-.%*`S0+)N`I4'MID+
-M$8MAN[,\.QJ`I=ZDA(5<O`KS[(+3L4-$,@&#*7!<`...@ao7y8*e9s#7l>B944(
-MO-&.8&:1K;>[K$?O7R-FWA;%5+E]WBV<T&*%[O-6_,_/]:YC;<A-%^UFF09U
-MP`*D@;&4KUHN&1:F_D1:YM:J-EG8L%<+BF4W%"6TU:I68MIJ6"FVH>T9PR7J
-MNU2C2G2>5**"XH4HD`PF+(*DTT&47'A+)B";NS-UH>(]7G^\/G_343KU\17<
-M<*""-SM"%>BVIJL8SF]7L-1.-LSRP2%=KX&C56*FC&#C$XNMGL)]3X&^$V4Z
-MY`()G`%`KUR!HU8Z'"HWNE&P6MI:KZ<F%H/X3DN/F&%#`.%8#!HTK295C.#[
-M+^4C&90I^(::@`Y$=<OX=S3?,A#ZU'\'^+PYHV2PK?Q-,&8/q...@$*x*=$a
-MK;I2)&A^MSZ`*](@"[>^Q"H0L7.OV8ZJW409[QO=`&&D%=5&@RP`MO%R/J#Q
-M-KJ*6D;EH7:dk0...@8hf*ip(>*YMR$>!+A,)X+;`$94@@?U]B/=2T0CY-2=
-M*_1FPF<-...@z-_,Q>06='5:(B#3`W$8Y!:C-CE22SM9*S$00,XXJTIZ!GA(
-LGTMN:F\J-,D9>?.38*!I7T>--*b_=t44h...@``"1;7#_Q=R13A0D!M#:2D`
+M0EIH.3%!629363S[0-4``,?_W?__R_158__Z/__?8*?owb8azb2`...@`,0"
+...@0c0`sx`6uh$p:f...@32fcu-d1z@#U'J!HT>H#0`!H`T9`#U-#33(-`-3TFA#1
+MJ933TFR%#(&@`#0-````'J`T``,.-#1HT&C0-``````R````-`9``8<:&C1H
+M-&@:`````!D````:`R``P1*(1$]3U,C(--``T!H:9``````:``&F)?&F1;DY
+M&:fb?6...@wg9x@8AM,HTK/Q9EXPZD#E2A$D)(@;F(g^b.92glb...@`+i1!
+M1$`';Y%%P_YU^!0+8BJ(@#DC&d...@d4"1D4?Z1!$1`&Z`V[]0H($(!6L90;<NF
+M9^?26V%/AEU/G]J7$.#!IBC,>:>A0V<))<GYB`(B`.INK=BX9"_=9R*"<::E
+MFLK=4PYO'Q\%X>XH7BH%"KAF8!:H8<BRI_..!GF=:H4'$...@-x.m"X!J02@
+M$"QE&OW!J]D&9...@$]-m!r8/GDX=A>\].K:4`Y`,4,!RN:#SL[!;-"!6%0F?`H
+m2_...@*%/%<\*!XL/C2%A1AI$8/AF(#SZ;]:>$5^/NKNO<+...@_cs4xui(Q*
+M123&G=9T]QQR?"=WMV(,&60`1D0:U043)E&22GWA);Z:"9R.A@,4,IL+O=L7
+M<MBZ,<:K"\_.A6THZ_!VK;Z[UT7!2MP4";.`R#RPL<*"C)0P,\'%UF#3%OPT
+MS>ACF:V5C!L"HB&,82/[./'>PAEG-"P<d...@zzcil]<TF$\Y02VP>A,D6T1+
+M2<\S]-*$,]X-XF%:_)1,W,=`,^+.N0""6@"85=H@<2FZ=HI-GDHK&)>/T74Y
+M+5>[4:S`Z`M87AHD`H6BE*8R%X=9AS$7&+Z?F%A.`<C&X,.+^:SH,(=)!_1_
+MRX-6BR.),-RP"J'7$A#:'R>AX!"x...@c5_?4^p".90`*]#[D(PA*&MPV7U2
+M;.]7.&/5...@c:J)S&T%=%,k...@x0[""E8G!I!/I%`KSMA<#^!%C+Y*")'1](
+MJ06:CXD^5K*:`$E<l...@bj/F_'T+B"7...@ztsh#q4d(HV+'N)`YXIE`=KP4=YJ=
+MJF(B!L#\<;%%HG<.lj9drd!...@li*e>`B`0$P5;&R;BF<5/Y7&(5A`<TB[M
+<.ZP#3X6R2U+IJWT5!$`<=U?^+N2*<*$@>?:!...@``
`
end
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
