Split the reference file here out into a separate file for

easier maintenance.

SVN-Revision: 142

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index 9829217fc41f80687db9b110f22071fedc5dc521..50e522bb4d575e39d27f5b353735badef184ad32 100644 (file)
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -25,26 +25,9 @@
 #include "test.h"
 __FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.3 2008/01/01 22:28:04 kientzle Exp $");
 
-static unsigned char archive[] = {
-'P','K',3,4,10,0,0,0,0,0,'Y','f',179,'6',0,0,0,0,0,0,0,0,0,0,0,0,4,0,21,0,
-'d','i','r','/','U','T',9,0,3,25,'U','O','F',25,'U','O','F','U','x',4,0,232,
-3,232,3,'P','K',3,4,20,0,0,0,8,0,'o','f',179,'6',':','7','f','=',10,0,0,0,
-18,0,0,0,5,0,21,0,'f','i','l','e','1','U','T',9,0,3,'A','U','O','F',172,'[',
-'O','F','U','x',4,0,232,3,232,3,203,'H',205,201,201,231,202,'@','"',1,'P',
-'K',3,4,20,0,0,0,8,0,'Z','j',179,'6',':','7','f','=',10,0,0,0,18,0,0,0,5,
-0,21,0,'f','i','l','e','2','U','T',9,0,3,172,'[','O','F',172,'[','O','F',
-'U','x',4,0,232,3,232,3,203,'H',205,201,201,231,202,'@','"',1,'P','K',1,2,
-23,3,10,0,0,0,0,0,'Y','f',179,'6',0,0,0,0,0,0,0,0,0,0,0,0,4,0,13,0,0,0,0,
-0,0,0,16,0,237,'A',0,0,0,0,'d','i','r','/','U','T',5,0,3,25,'U','O','F','U',
-'x',0,0,'P','K',1,2,23,3,20,0,0,0,8,0,'o','f',179,'6',':','7','f','=',10,
-0,0,0,18,0,0,0,5,0,13,0,0,0,0,0,1,0,0,0,164,129,'7',0,0,0,'f','i','l','e',
-'1','U','T',5,0,3,'A','U','O','F','U','x',0,0,'P','K',1,2,23,3,20,0,0,0,8,
-0,'Z','j',179,'6',':','7','f','=',10,0,0,0,18,0,0,0,5,0,13,0,0,0,0,0,1,0,
-0,0,164,129,'y',0,0,0,'f','i','l','e','2','U','T',5,0,3,172,'[','O','F','U',
-'x',0,0,'P','K',5,6,0,0,0,0,3,0,3,0,191,0,0,0,187,0,0,0,0,0};
-
 DEFINE_TEST(test_read_format_zip)
 {
+       const char *refname = "test_read_format_zip.zip";
        struct archive_entry *ae;
        struct archive *a;
        char *buff[128];
@@ -52,10 +35,11 @@ DEFINE_TEST(test_read_format_zip)
        size_t s;
        off_t o;
 
+       extract_reference_file(refname);
        assert((a = archive_read_new()) != NULL);
        assertA(0 == archive_read_support_compression_all(a));
        assertA(0 == archive_read_support_format_all(a));
-       assertA(0 == archive_read_open_memory(a, archive, sizeof(archive)));
+       assertA(0 == archive_read_open_filename(a, refname, 10240));
        assertA(0 == archive_read_next_header(a, &ae));
        assertEqualString("dir/", archive_entry_pathname(ae));
        assertEqualInt(1179604249, archive_entry_mtime(ae));

diff --git a/libarchive/test/test_read_format_zip.zip.uu b/libarchive/test/test_read_format_zip.zip.uu
new file mode 100644 (file)
index 0000000..f61340e
--- /dev/null
+++ b/libarchive/test/test_read_format_zip.zip.uu
@@ -0,0 +1,13 @@
+$FreeBSD$
+begin 645 test_read_format_zip.zip
+M4$L#!`H``````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1AE5
+M3T95>`0`Z`/H`U!+`P04````"`!O9K,V.C=F/0H````2````!0`5`&9I;&4Q
+M550)``-!54]&K%M/1E5X!`#H`^@#RTC-R<GGRD`B`5!+`P04````"`!::K,V
+M.C=F/0H````2````!0`5`&9I;&4R550)``.L6T]&K%M/1E5X!`#H`^@#RTC-
+MR<GGRD`B`5!+`0(7`PH``````%EFLS8````````````````$``T`````````
+M$`#M00````!D:7(O550%``,954]&57@``%!+`0(7`Q0````(`&]FLS8Z-V8]
+M"@```!(````%``T```````$```"D@3<```!F:6QE,554!0`#055/1E5X``!0
+M2P$"%P,4````"`!::K,V.C=F/0H````2````!0`-```````!````I(%Y````
+H9FEL93)55`4``ZQ;3T95>```4$L%!@`````#``,`OP```+L`````````
+`
+end