diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2009-11-02 01:48:54 -0500 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2009-11-02 01:48:54 -0500 |
| commit | 40200e9514b4ad60f06043c91ae3fe1ef6d5b106 (patch) | |
| tree | 23f0fcc72cc9dc5ff8b7323af612e8058452cd9b /libarchive/test/test_read_format_isojoliet_bz2.c | |
| parent | a4a5515023ef3117af85fdcf984e76cc40f83a25 (diff) | |
| download | libarchive-40200e9514b4ad60f06043c91ae3fe1ef6d5b106.tar.gz | |
Compression of test data for ISO reader switch from bzip2/gz to compress
so that all of ISO reader tests can be worked on every platform.
SVN-Revision: 1579
Diffstat (limited to 'libarchive/test/test_read_format_isojoliet_bz2.c')
| -rw-r--r-- | libarchive/test/test_read_format_isojoliet_bz2.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index 5e89874f..31bde95d 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -45,31 +45,24 @@ else TZ=utc touch -afhm -t 197001020000.01 /tmp/iso /tmp/iso/long-joliet-file-name.textfile /tmp/iso/dir TZ=utc touch -afhm -t 197001030000.02 /tmp/iso/symlink fi -mkhybrid -J -uid 1 -gid 2 /tmp/iso | bzip2 > test_read_format_isojoliet_bz2.iso.bz2 -F=test_read_format_isojoliet_bz2.iso.bz2 +F=test_read_format_iso_joliet.iso.Z +mkhybrid -J -uid 1 -gid 2 /tmp/iso | compress > $F uuencode $F $F > $F.uu exit 1 */ DEFINE_TEST(test_read_format_isojoliet_bz2) { - const char *refname = "test_read_format_isojoliet_bz2.iso.bz2"; + const char *refname = "test_read_format_iso_joliet.iso.Z"; 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_compression_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_set_options(a, "iso9660:!rockridge")); @@ -131,7 +124,7 @@ DEFINE_TEST(test_read_format_isojoliet_bz2) assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Verify archive format. */ - assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); + assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); /* Close the archive. */ assertEqualInt(0, archive_read_close(a)); |