Use times at least a full 24 hours after the Epoch for testing.

In particular, this should fix tests on systems that lack timegm(),
whose mktime() cannot handle times prior to the Epoch, when run
in timezones with negative offsets from GMT.

SVN-Revision: 131

diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c
index 1a04178810dc5acb673df56b1746eba95ae3fc2e..e083af6e990d26de5f2a32f5f8470e985c3e7427 100644 (file)
--- a/libarchive/test/test_read_format_isorr_bz2.c
+++ b/libarchive/test/test_read_format_isorr_bz2.c
@@ -35,8 +35,8 @@ mkdir /tmp/iso/dir
 echo "hello" >/tmp/iso/file
 ln /tmp/iso/file /tmp/iso/hardlink
 (cd /tmp/iso; ln -s file symlink)
-TZ=utc touch -afhm -t 197001010000.01 /tmp/iso /tmp/iso/file /tmp/iso/dir
-TZ=utc touch -afhm -t 196912312359.58 /tmp/iso/symlink
+TZ=utc touch -afhm -t 197001020000.01 /tmp/iso /tmp/iso/file /tmp/iso/dir
+TZ=utc touch -afhm -t 197001030000.02 /tmp/iso/symlink
 mkhybrid -R -uid 1 -gid 2 /tmp/iso | bzip2 > test_read_format_isorr_bz2.iso.bz2
 F=test_read_format_isorr_bz2.iso.bz2
 uuencode $F $F > $F.uu
@@ -63,9 +63,9 @@ DEFINE_TEST(test_read_format_isorr_bz2)
        assertEqualString(".", archive_entry_pathname(ae));
        assert(S_ISDIR(archive_entry_stat(ae)->st_mode));
        assertEqualInt(2048, archive_entry_size(ae));
-       assertEqualInt(1, archive_entry_mtime(ae));
+       assertEqualInt(86401, archive_entry_mtime(ae));
        assertEqualInt(0, archive_entry_mtime_nsec(ae));
-       assertEqualInt(1, archive_entry_ctime(ae));
+       assertEqualInt(86401, archive_entry_ctime(ae));
        assertEqualInt(0, archive_entry_stat(ae)->st_nlink);
        assertEqualInt(0, archive_entry_uid(ae));
        assertEqualIntA(a, ARCHIVE_EOF,
@@ -77,8 +77,8 @@ DEFINE_TEST(test_read_format_isorr_bz2)
        assertEqualString("dir", archive_entry_pathname(ae));
        assert(S_ISDIR(archive_entry_stat(ae)->st_mode));
        assertEqualInt(2048, archive_entry_size(ae));
-       assertEqualInt(1, archive_entry_mtime(ae));
-       assertEqualInt(1, archive_entry_atime(ae));
+       assertEqualInt(86401, archive_entry_mtime(ae));
+       assertEqualInt(86401, archive_entry_atime(ae));
        assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
        assertEqualInt(1, archive_entry_uid(ae));
        assertEqualInt(2, archive_entry_gid(ae));
@@ -92,8 +92,8 @@ DEFINE_TEST(test_read_format_isorr_bz2)
        assertEqualInt(6, size);
        assertEqualInt(0, offset);
        assertEqualInt(0, memcmp(p, "hello\n", 6));
-       assertEqualInt(1, archive_entry_mtime(ae));
-       assertEqualInt(1, archive_entry_atime(ae));
+       assertEqualInt(86401, archive_entry_mtime(ae));
+       assertEqualInt(86401, archive_entry_atime(ae));
        assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
        assertEqualInt(1, archive_entry_uid(ae));
        assertEqualInt(2, archive_entry_gid(ae));
@@ -104,8 +104,8 @@ DEFINE_TEST(test_read_format_isorr_bz2)
        assert(S_ISREG(archive_entry_stat(ae)->st_mode));
        assertEqualString("file", archive_entry_hardlink(ae));
        assertEqualInt(6, archive_entry_size(ae));
-       assertEqualInt(1, archive_entry_mtime(ae));
-       assertEqualInt(1, archive_entry_atime(ae));
+       assertEqualInt(86401, archive_entry_mtime(ae));
+       assertEqualInt(86401, archive_entry_atime(ae));
        assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
        assertEqualInt(1, archive_entry_uid(ae));
        assertEqualInt(2, archive_entry_gid(ae));
@@ -116,8 +116,8 @@ DEFINE_TEST(test_read_format_isorr_bz2)
        assert(S_ISLNK(archive_entry_stat(ae)->st_mode));
        assertEqualString("file", archive_entry_symlink(ae));
        assertEqualInt(0, archive_entry_size(ae));
-       assertEqualInt(-2, archive_entry_mtime(ae));
-       assertEqualInt(-2, archive_entry_atime(ae));
+       assertEqualInt(172802, archive_entry_mtime(ae));
+       assertEqualInt(172802, archive_entry_atime(ae));
        assertEqualInt(1, archive_entry_stat(ae)->st_nlink);
        assertEqualInt(1, archive_entry_uid(ae));
        assertEqualInt(2, archive_entry_gid(ae));

diff --git a/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu b/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
index 6f9bdc4331af0890cef98274494b8c263ac80233..3f0cfca502150589aa19d5db9a842ab9006eaa3f 100644 (file)
--- a/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
+++ b/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
@@ -1,22 +1,22 @@
 begin 644 test_read_format_isorr_bz2.iso.bz2
-M0EIH.3%!629369D1<BH``,?_W?__R_S58__X/__?8*?OWB8AZB0`,`$@`$0"
-M@0C``P[CL<:03N$H@0@RGE3R39--$'J`]0T:`>H`-#)LB!ZCQ,B&@8@)4R:)
-M3S32#5/$TFF@R#0>B8@``#0```-`,1H&TI$0`!H``````````````:`D4H$#
-M0``#0&@``#0```T````",1CJ-5#(?9Z!&"02F9_)#0+%DT>#A9!^E0)_5(E8
-M-#8VT!*:$?;0KJ$#H8`:XP`2^&"`22KI4`GOPHYT!*0T`)`J9#(-H3`2;3:!
-M(0*0TB.U!*"`443'!$=9"X]N52(X=M9%X>?K%,)JY:(3B'1.7CP50TVY("20
-M+]L(Y1/HA1%M-1QR$W&J?%Y/)I7:Z!T10%=-.$!.U\39T@,4PHR00%._@Y`$
-MH5`$="!@-14X*+`+8"2>0*)&.2/$%3,4UN7%-6;#0C;J$/1!10,8%,0C'F`H
-MF))HVB#(`P9(<#>`@0;G[%"(ZEL+\N!Q$/0[:H6"2X,].7@US8;^=CYYT_LJ
-MU&LQ1;N.#E17MW)GXW\O"S&N?-"*D_%EB0LS`,2F+.YA2C99+$KER#-D$FZ$
-MD;,*EZJ4PT$<0Z:,1,2I-BLHRFFHF9J8XQB5YM>Y!'(Z2A56YCW@H93R#J54
-M)K(N.R',<9Y@^/`3=JDK;6RH93?SN;NEQO^UF9+7,(ZET@,5LF09#?G36AU%
-MC6B7VNDC+V;S7LRTA'(Y04A4FL3%&B^"R^5DS%DMBVR,K.NN(W@,4]M`T\K,
-MM>4I9XJIF)M;J0KS;[1AGO=<A07W)$>6`PU5:UI*PQ$+UN<AA24:]@:BD$RW
-M/N6X=OG0H<A"Q3^&XD![57I85MQM0,Q#&B"I@(V15..@V*ZCJD-'9V_P"P=4
-M!=O_E!7(+4]]M[,G8^F+0@9>B)'(*^=5*2P"-NES83(%'<4K:27,0NQ)1HIG
-M&,3')SIO$)I;)";4?(M=:L\0$L*%&_O^%:U1@&/=V;3.M?:W:XN'>*9M7;FR
-M<7:[R*JB5B)U:33XY2(P/6=O'T9VCC3KW]*2B$,)=!H[5WHR-UT,%1*OO(XF
-BQ+:8V'<+9&$F7<WXI(II_TVD@!(I%_?XNY(IPH2$R(N14```
+M0EIH.3%!629361M#:2D``,?_W?__6_Y58_GX/__?X*?OWB8AZB0`,`$@`$0"
+M@0C``QP`U:!,&J>FJ>2:CR)^I'ZB#3U/4-`!H:#(:``]0P@`!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$A3@$*X*=$A
+MK;I2)&A^MSZ`*](@"[>^Q"H0L7.OV8ZJW409[QO=`&&D%=5&@RP`MO%R/J#Q
+M-KJ*6D;EH7:DK0.48@8HF*IP(>*YMR$>!+A,)X+;`$94@@?U]B/=2T0CY-2=
+M*_1FPF<-G\\@Z-_,Q>06='5:(B#3`W$8Y!:C-CE22SM9*S$00,XXJTIZ!GA(
+LGTMN:F\J-,D9>?.38*!I7T>--*B_=T44HJ?#@``"1;7#_Q=R13A0D!M#:2D`
 `
 end