diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-03 17:02:51 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-03 17:02:51 +0000 |
| commit | 8fc5e74eab7c5235eef741a5e99412c1c314b9c6 (patch) | |
| tree | 1dee8b4b9c023077ab174a6dc9ffbb460e86b36b /lib/libarchive/test/test_read_format_zip.c | |
| parent | 534d3efa16fa0651c5b97d3d506ddce25334a6d9 (diff) | |
| download | FreeBSD-src-8fc5e74eab7c5235eef741a5e99412c1c314b9c6.zip FreeBSD-src-8fc5e74eab7c5235eef741a5e99412c1c314b9c6.tar.gz | |
Merge r294:337,r348:350 from libarchive.googlecode.com: A lot
of work to make libarchive work on Windows.
Diffstat (limited to 'lib/libarchive/test/test_read_format_zip.c')
| -rw-r--r-- | lib/libarchive/test/test_read_format_zip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libarchive/test/test_read_format_zip.c b/lib/libarchive/test/test_read_format_zip.c index 06386ca..77d6616 100644 --- a/lib/libarchive/test/test_read_format_zip.c +++ b/lib/libarchive/test/test_read_format_zip.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); DEFINE_TEST(test_read_format_zip) { +#if HAVE_ZLIB_H const char *refname = "test_read_format_zip.zip"; struct archive_entry *ae; struct archive *a; @@ -52,7 +53,7 @@ DEFINE_TEST(test_read_format_zip) assertEqualInt(0, archive_entry_size(ae)); assertEqualIntA(a, ARCHIVE_EOF, archive_read_data_block(a, &pv, &s, &o)); - assertEqualInt(s, 0); + assertEqualInt((int)s, 0); assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file1", archive_entry_pathname(ae)); assertEqualInt(1179604289, archive_entry_mtime(ae)); @@ -77,6 +78,9 @@ DEFINE_TEST(test_read_format_zip) #else assert(0 == archive_read_finish(a)); #endif +#else + skipping("Need zlib"); +#endif } |
