diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-12-30 05:59:21 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-12-30 05:59:21 +0000 |
| commit | fa94194ff849f6933fedb15396e96731eb2c4157 (patch) | |
| tree | a878f899f5526c6be691b6194342f1ddd9a9fdd9 /lib/libarchive/test/test_read_compress_program.c | |
| parent | c6d0b4dd8b2ab36f3e73a6ad81509d14d32bafae (diff) | |
| download | FreeBSD-src-fa94194ff849f6933fedb15396e96731eb2c4157.zip FreeBSD-src-fa94194ff849f6933fedb15396e96731eb2c4157.tar.gz | |
A raft of test changes and improvements from the Googlecode repository.
In particular, this includes tests for the new features I've merged
over the last few days.
Diffstat (limited to 'lib/libarchive/test/test_read_compress_program.c')
| -rw-r--r-- | lib/libarchive/test/test_read_compress_program.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/libarchive/test/test_read_compress_program.c b/lib/libarchive/test/test_read_compress_program.c index 042c615..12e6afc 100644 --- a/lib/libarchive/test/test_read_compress_program.c +++ b/lib/libarchive/test/test_read_compress_program.c @@ -37,7 +37,6 @@ DEFINE_TEST(test_read_compress_program) int r; struct archive_entry *ae; struct archive *a; - const char *extprog; /* * First, test handling when a non-existent compression @@ -53,26 +52,23 @@ DEFINE_TEST(test_read_compress_program) assertEqualIntA(a, ARCHIVE_OK, r); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, - archive_read_open_memory(a, archive, sizeof(archive))); assertEqualIntA(a, ARCHIVE_FATAL, - archive_read_next_header(a, &ae)); - assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a)); + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); /* * If we have "gzip -d", try using that. */ - if ((extprog = external_gzip_program(1)) == NULL) { - skipping("There is no gzip uncompression " - "program in this platform"); + if (!canGunzip()) { + skipping("Can't run gunzip program on this platform"); return; } assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_none(a)); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_program(a, extprog)); + archive_read_support_compression_program(a, "gunzip")); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, |
