From: Michihiro NAKAJIMA Date: Thu, 8 Oct 2009 23:27:58 +0000 (-0400) Subject: Split a test mixed Joliet and Rock Ridge from test_read_format_isojoliet_bz2.c X-Git-Tag: v2.8.0~317 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c159751269423ca05d16594c528c7de48fdd4eaf;p=thirdparty%2Flibarchive.git Split a test mixed Joliet and Rock Ridge from test_read_format_isojoliet_bz2.c and fix script that describes how to make test data for that test. Remove test_read_format_isojolietrr_bz2.iso.bz2.uu which was wrong data; access time of hardlinke file wasn't changed by touch command. Add new test data test_read_format_isojoliet_rr.iso.bz2.uu instead. SVN-Revision: 1491 --- diff --git a/Makefile.am b/Makefile.am index c91854ff3..ab6a78cfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -259,6 +259,7 @@ libarchive_test_SOURCES= \ libarchive/test/test_read_format_iso_gz.c \ libarchive/test/test_read_format_isojoliet_bz2.c \ libarchive/test/test_read_format_isojoliet_long.c \ + libarchive/test/test_read_format_isojoliet_rr.c \ libarchive/test/test_read_format_isorr_bz2.c \ libarchive/test/test_read_format_isorr_new_bz2.c \ libarchive/test/test_read_format_isozisofs_bz2.c \ @@ -341,7 +342,7 @@ libarchive_test_EXTRA_DIST=\ libarchive/test/test_read_format_iso_gz.iso.gz.uu \ libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu \ libarchive/test/test_read_format_isojoliet_long.iso.bz2.uu \ - libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu \ + libarchive/test/test_read_format_isojoliet_rr.iso.bz2.uu \ libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu \ libarchive/test/test_read_format_isorr_new_bz2.iso.bz2.uu \ libarchive/test/test_read_format_isozisofs_bz2.iso.bz2.uu \ diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt index 01add6fb6..47a74921b 100644 --- a/libarchive/test/CMakeLists.txt +++ b/libarchive/test/CMakeLists.txt @@ -58,6 +58,7 @@ IF(ENABLE_TEST) test_read_format_iso_gz.c test_read_format_isojoliet_bz2.c test_read_format_isojoliet_long.c + test_read_format_isojoliet_rr.c test_read_format_isorr_bz2.c test_read_format_isorr_new_bz2.c test_read_format_isozisofs_bz2.c diff --git a/libarchive/test/Makefile b/libarchive/test/Makefile index 0de07c599..31d75fba2 100644 --- a/libarchive/test/Makefile +++ b/libarchive/test/Makefile @@ -53,6 +53,7 @@ TESTS= \ test_read_format_iso_gz.c \ test_read_format_isojoliet_bz2.c \ test_read_format_isojoliet_long.c \ + test_read_format_isojoliet_rr.c \ test_read_format_isorr_bz2.c \ test_read_format_isorr_new_bz2.c \ test_read_format_isozisofs_bz2.c \ diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index 44042ac26..2bb6af614 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -51,8 +51,7 @@ uuencode $F $F > $F.uu exit 1 */ -static void -joliettest(int withrr) +DEFINE_TEST(test_read_format_isojoliet_bz2) { const char *refname = "test_read_format_isojoliet_bz2.iso.bz2"; struct archive_entry *ae; @@ -62,10 +61,6 @@ joliettest(int withrr) off_t offset; int r; - if (withrr) { - refname = "test_read_format_isojolietrr_bz2.iso.bz2"; - } - extract_reference_file(refname); assert((a = archive_read_new()) != NULL); r = archive_read_support_compression_bzip2(a); @@ -102,11 +97,6 @@ joliettest(int withrr) assertEqualInt(2048, archive_entry_size(ae)); assertEqualInt(86401, archive_entry_mtime(ae)); assertEqualInt(86401, archive_entry_atime(ae)); - if (withrr) { - assertEqualInt(2, archive_entry_stat(ae)->st_nlink); - assertEqualInt(1, archive_entry_uid(ae)); - assertEqualInt(2, archive_entry_gid(ae)); - } /* A regular file with two names ("hardlink" gets returned * first, so it's not marked as a hardlink). */ @@ -119,16 +109,6 @@ joliettest(int withrr) assertEqualInt(6, (int)size); assertEqualInt(0, offset); assertEqualInt(0, memcmp(p, "hello\n", 6)); - if (withrr) { - assertEqualInt(86401, archive_entry_mtime(ae)); - assertEqualInt(86401, archive_entry_atime(ae)); - /* TODO: Actually, libarchive should be able to - * compute nlinks correctly even without RR - * extensions. See comments in libarchive source. */ - assertEqualInt(2, archive_entry_nlink(ae)); - assertEqualInt(1, archive_entry_uid(ae)); - assertEqualInt(2, archive_entry_gid(ae)); - } /* Second name for the same regular file (this happens to be * returned second, so does get marked as a hardlink). */ @@ -138,60 +118,22 @@ joliettest(int withrr) assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); assertEqualString("hardlink", archive_entry_hardlink(ae)); assert(!archive_entry_size_is_set(ae)); - if (withrr) { - assertEqualInt(86401, archive_entry_mtime(ae)); - assertEqualInt(86401, archive_entry_atime(ae)); - /* TODO: See above. */ - assertEqualInt(2, archive_entry_nlink(ae)); - assertEqualInt(1, archive_entry_uid(ae)); - assertEqualInt(2, archive_entry_gid(ae)); - } /* A symlink to the regular file. */ assertEqualInt(0, archive_read_next_header(a, &ae)); assertEqualString("symlink", archive_entry_pathname(ae)); - if (withrr) { - assertEqualInt(AE_IFLNK, archive_entry_filetype(ae)); - assertEqualString("long-joliet-file-name.textfile", - archive_entry_symlink(ae)); - } assertEqualInt(0, archive_entry_size(ae)); assertEqualInt(172802, archive_entry_mtime(ae)); assertEqualInt(172802, archive_entry_atime(ae)); - if (withrr) { - assertEqualInt(1, archive_entry_nlink(ae)); - assertEqualInt(1, archive_entry_uid(ae)); - assertEqualInt(2, archive_entry_gid(ae)); - } /* End of archive. */ assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Verify archive format. */ assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); - if (withrr) { - assertEqualInt(archive_format(a), - ARCHIVE_FORMAT_ISO9660_ROCKRIDGE); - } /* Close the archive. */ assertEqualInt(0, archive_read_close(a)); assertEqualInt(0, archive_read_finish(a)); } - -DEFINE_TEST(test_read_format_isojoliet_bz2) -{ - joliettest(0); - - /* XXXX This doesn't work today; can it be made to work? */ -#if 0 - joliettest(1); -#else - skipping("Mixed Joliet/RR not fully supported yet."); -#endif -} - - - - diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c new file mode 100644 index 000000000..3a5604729 --- /dev/null +++ b/libarchive/test/test_read_format_isojoliet_rr.c @@ -0,0 +1,164 @@ +/*- + * Copyright (c) 2003-2007 Tim Kientzle + * All rights reserved. + * + * Based on libarchive/test/test_read_format_isorr_bz2.c with + * bugs introduced by Andreas Henriksson for + * testing ISO9660 image with Joliet extension. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include "test.h" + +/* +Execute the following to rebuild the data for this program: + tail -n +35 test_read_format_isojoliet_rr.c | /bin/sh + +rm -rf /tmp/iso +mkdir /tmp/iso +mkdir /tmp/iso/dir +file="long-joliet-file-name.textfile" +echo "hello" >/tmp/iso/$file +ln /tmp/iso/$file /tmp/iso/hardlink +(cd /tmp/iso; ln -s $file symlink) +if [ "$(uname -s)" = "Linux" ]; then # gnu coreutils touch doesn't have -h +TZ=utc touch -afm -t 197001020000.01 /tmp/iso/hardlink /tmp/iso/$file /tmp/iso/dir +TZ=utc touch -afm -t 197001030000.02 /tmp/iso/symlink +TZ=utc touch -afm -t 197001020000.01 /tmp/iso +else +TZ=utc touch -afhm -t 197001020000.01 /tmp/iso/hardlink /tmp/iso/$file /tmp/iso/dir +TZ=utc touch -afhm -t 197001030000.02 /tmp/iso/symlink +TZ=utc touch -afhm -t 197001020000.01 /tmp/iso +fi +F=test_read_format_isojoliet_rr.iso.bz2 +mkhybrid -J -uid 1 -gid 2 /tmp/iso | bzip2 > $F +uuencode $F $F > $F.uu +exit 1 + */ + +DEFINE_TEST(test_read_format_isojoliet_rr) +{ + const char *refname = "test_read_format_isojoliet_rr.iso.bz2"; + struct archive_entry *ae; + struct archive *a; + const void *p; + size_t size; + off_t offset; + int r; + + extract_reference_file(refname); + assert((a = archive_read_new()) != NULL); + r = archive_read_support_compression_bzip2(a); + if (r == ARCHIVE_WARN) { + skipping("bzip2 reading not fully supported on this platform"); + assertEqualInt(0, archive_read_finish(a)); + return; + } + assertEqualInt(0, r); + assertEqualInt(0, archive_read_support_format_all(a)); + assertEqualInt(ARCHIVE_OK, + archive_read_open_filename(a, refname, 10240)); + + /* First entry is '.' root directory. */ + assertEqualInt(0, archive_read_next_header(a, &ae)); + assertEqualString(".", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); + assertEqualInt(2048, archive_entry_size(ae)); + assertEqualInt(86401, archive_entry_mtime(ae)); + assertEqualInt(0, archive_entry_mtime_nsec(ae)); + assertEqualInt(3, archive_entry_stat(ae)->st_nlink); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualIntA(a, ARCHIVE_EOF, + archive_read_data_block(a, &p, &size, &offset)); + assertEqualInt((int)size, 0); + + /* A directory. */ + assertEqualInt(0, archive_read_next_header(a, &ae)); + assertEqualString("dir", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); + assertEqualInt(2048, archive_entry_size(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)); + + /* A regular file with two names ("hardlink" gets returned + * first, so it's not marked as a hardlink). */ + assertEqualInt(0, archive_read_next_header(a, &ae)); + assertEqualString("hardlink", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); + assert(archive_entry_hardlink(ae) == NULL); + assertEqualInt(6, 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)); + assertEqualInt(86401, archive_entry_mtime(ae)); + /* mkisofs records their access time. */ + /*assertEqualInt(86401, archive_entry_atime(ae));*/ + /* TODO: Actually, libarchive should be able to + * compute nlinks correctly even without RR + * extensions. See comments in libarchive source. */ + assertEqualInt(2, archive_entry_nlink(ae)); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); + + /* Second name for the same regular file (this happens to be + * returned second, so does get marked as a hardlink). */ + assertEqualInt(0, archive_read_next_header(a, &ae)); + assertEqualString("long-joliet-file-name.textfile", + archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); + assertEqualString("hardlink", archive_entry_hardlink(ae)); + assert(!archive_entry_size_is_set(ae)); + assertEqualInt(86401, archive_entry_mtime(ae)); + assertEqualInt(86401, archive_entry_atime(ae)); + /* TODO: See above. */ + assertEqualInt(2, archive_entry_nlink(ae)); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); + + /* A symlink to the regular file. */ + assertEqualInt(0, archive_read_next_header(a, &ae)); + assertEqualString("symlink", archive_entry_pathname(ae)); + assertEqualInt(AE_IFLNK, archive_entry_filetype(ae)); + assertEqualString("long-joliet-file-name.textfile", + archive_entry_symlink(ae)); + assertEqualInt(0, archive_entry_size(ae)); + assertEqualInt(172802, archive_entry_mtime(ae)); + assertEqualInt(172802, archive_entry_atime(ae)); + assertEqualInt(1, archive_entry_nlink(ae)); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); + + /* End of archive. */ + assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); + + /* Verify archive format. */ + assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE); + + /* Close the archive. */ + assertEqualInt(0, archive_read_close(a)); + assertEqualInt(0, archive_read_finish(a)); +} + diff --git a/libarchive/test/test_read_format_isojoliet_rr.iso.bz2.uu b/libarchive/test/test_read_format_isojoliet_rr.iso.bz2.uu new file mode 100644 index 000000000..3eebaac72 --- /dev/null +++ b/libarchive/test/test_read_format_isojoliet_rr.iso.bz2.uu @@ -0,0 +1,31 @@ +begin 644 test_read_format_isojoliet_rr.iso.bz2 +M0EIH.3%!62936>6EH6P``/1_____Q_?_9__\/__?8:__GF8DJD`!)$`00>`` +M`(```LD(T`1^`B!(VM*0#1$T&HQ3R2:'J-I-/0&TDT`9-&-)DQ&:`]1DTTC3 +MU&C]$&@C"&&B:$,J>TI@1J>GJGI`R#0R:!B:,F"!B:&C3)@)D:&)@3)D'``` +M``````````````````#@`````````````````````D2$($&5/9%/34;*>GJA +MIDVIFH](-&TGI#T@:`TT;:2-/4/4V4/2;1-'I+`43=>#%["-XX:D%L%8K`LT +M-%+E!I!YQY_+%Q'C\AJ4-.YA!/G +M(`!+PL$D@#5JA+%AM"PXLM`E6T-@)"2-$$TH&P0T"38FT(;S(<`0-"0)(LL@ +M*VD&J"3L8D*!B4Z4BDH&1*8*HTX;Y_%O%)D;^G*H*01KZDLL2798ECD0A(0V +M(-MB1GOZ:I[$X^LBZN'P;/J8^L" +MA7A9[.K!&_*:=4M&.]L^3@[[D4 +M]$ED_&Q)A=TY6LXW(#$A-,AL9,J`O@KP6@2D"3(328TAC`\37E4HK3A44(Z(#R`Y,F +M'@@%A&"V6=L%0$M(YO0!=BVM0M$"+8)]W:Z=Z[O`HF\DXIDY8$@FF,'LPH&, +M8,3!H9;B+"$`@!C/!@4GK;!*)1%D^=!%-$JS%RQY/):".-=."&LZ\E$;_/I, +ML&1J3;_:NA56-&T=P^RTM4<;1%X0+P`&-\Q_Y5,3P1E$(!,(A5D*&Q,S<=EN +MD07S"!(.:"GH:I&0VR,5>=+&:N/1,9?KMG*Z^*]GL."Z9\90N.\EF7)2%QI69%$&YD0?*"89$@0VDZ2>B+ +M&"0=="KJ7!SJ.RZB)$1:@O($D*-`46,N*!/1.OPX[Z`R$&E?`'0`EJQ"!CM4 +M#<-MZDN2,<0:05&^J\0M6-=B(]1R5P=<1BS7S+$:0`XL(S)0%VUGL&-T`M&4 +MC6NZ%DBZR,WQ6LPPSH&OUJKNCG3KITT$S(A4(VA!,`L+=+?)"]FA0%L$%*0Z +M=@ZYPBFV0NM&XGDJ<*-E*T;R8+(R,,F1!R_TP@1;I`*+ZRJ>!.R0,J-*])LA +MXBO-KCS8Y[*2P-7&;_._;R!*BOBN`8,Y-,MWHE6C/"9)&K8P.[(-O=4$E=(; +MV$50*9358;*&"/D4+);CFM`KR/4QC3MQ6!PX,P?-1BVH-!B@=66:""ET8H&R +MU5'YE@&"K!9?9)4Z$&AOG!=F'Z#TVE^I]AB@G74;16:A!%LE!MXX`^3L7#O@ +MSZ.E5:&6QBNAVBK-S;57A9[(+XCORVN2`RBZ7C]YES@&0B=O6E)A_V6=?=-<)+2A0/@PYT^F4)RZYM^5TF$^3G=)%$5/RPJQL20A(RT?*OS8 +-NHO_%W)%.%"0Y:6A;``` +` +end diff --git a/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu b/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu deleted file mode 100644 index d5ebfe45c..000000000 --- a/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu +++ /dev/null @@ -1,28 +0,0 @@ -begin 644 test_read_format_isojolietrr_bz2.iso.bz2 -M0EIH.3%!6293695"/:0``/9_^__?1??^8_WL/__?8:?_W&8@Z@$`9``008"` -M``+)"-`$/@36`T;`8#*3*GY3U-$R`T::`&F@`!HQ`T9&FC0T!Z@8C0``-"-$ -M9&IA-!3U`9`:-``]0``#0T!H`](`'J9!P`---``9```-```-```R``&AH`<` -M#330`&0``#0``#0``,@`!H:`"1$FIBFBGE/&H;4/5!H&GJ9,C(&3]4>H&T@! -MX4S4_23)^I!^J&,I:"BCP:NQU49CQU07@K5:%N+FASC:#&<_H!T3^C_8,EAR -M>AAY@*??BYHEH;&-B%4:0N+*$9NC-0L@CJ9)U!$ST`F*D.$$@A"`320`3$S7*"&2:*6P36])5 -M/UEPPP-G5GGH*!-7B20Y.4AU"9MM0?K(C+%&%#XTJCZZ.GH)4JHJ2)5-QVD^9IA` -MJ%BPT5G;#K;5KM8^'@["26TJX1E,$$=G]($UUB04B("910H3*'`R0R@/,#L98&B`7-& -M"[C.G57E"$CP=BMVJ(CYQYJ5$37&!`J`\K""HB!0#0RZ(M($"`9Q##2WW*HJ -M);;2U[_KWUN>.EE\=W@T_FK1D:C59VF:FHGY.JASX+#OO(K0+@#!@Q]C&S&H -M`7LV-TZ>LFMC7W3@.V;-37Q'^&I-3X>E;:0!I<(H#U#>7?02J"@4(*Z"%P[! -M6EG=HX+CKQ:+0*\$Q3=05!208:0Y"@I%)<\JQ^N8_<147'#8&2%E+]X01#.8H+0J!NJ=8/99+F^C?B4L"NABYS:$@T -M'/CG%2[+1.R0(O$0N!93,D"!H`F$B'`C,2"&!,YML_<*Q@:I#GK1GP-FSA<4[2H)(;4,0KAA2WE9%>%ON#\AF6`/K>AZ1ANTM,HF-?E[&N9,4K"B`+BOD -M8@EUE%*/R3*BB??@W::!E$)SBI"^BVHM`:'\%!%LYRN"?R"*%<;]L%PA*8D6 -M&308D=DJ0@QK`WG%UU,P`J:*I[QA@7209C/",;1QGP#*<9E+.QRP=LH1>,W6 -M!<9P9GG`,J,5X?86:?0MKY&=E+J,Q^(SV!J&$TR2_.,A$X(1A-HSDR/.S#PG -ILA)[>>5(]8W)ZY0BAMDR3TMM%$6