IFC: test suite builds with 1.x API

SVN-Revision: 181

diff --git a/libarchive/archive_write_set_format_ar.c b/libarchive/archive_write_set_format_ar.c
index d93f3cb8dbf026f5dc1b2c308532d6e01073a5ea..281f3a6a5e74cb17dd07354de0a82a3767a8a38a 100644 (file)
--- a/libarchive/archive_write_set_format_ar.c
+++ b/libarchive/archive_write_set_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.7 2008/05/26 17:00:23 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.8 2008/08/10 02:06:28 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
index 1b29c5fc7ffcd89702665d1d94d73d1bc2175731..ee6cafda37e34b87b21fd17febf6950720e3a4dc 100644 (file)
--- a/libarchive/archive_write_set_format_pax.c
+++ b/libarchive/archive_write_set_format_pax.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.47 2008/05/26 17:00:23 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.48 2008/08/10 02:06:28 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

diff --git a/libarchive/test/test_compat_tar_hardlink.c b/libarchive/test/test_compat_tar_hardlink.c
index ae71e9232c5b4df7aa6260ebced2c012171fcb3f..30785d1fb0c1e5dd4f99de0fa02d512b3774951d 100644 (file)
--- a/libarchive/test/test_compat_tar_hardlink.c
+++ b/libarchive/test/test_compat_tar_hardlink.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.2 2008/03/12 05:12:23 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
 
 /*
  * Background:  There are two written standards for the tar file format.
@@ -93,7 +93,11 @@ test_compat_tar_hardlink_1(void)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_read_finish(a);
+#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+#endif
 }
 
 DEFINE_TEST(test_compat_tar_hardlink)

diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c
index aad8327431d979047d7e41d85bfbe43b6ef12f4b..6bbd271758c760a80d78b9bfb3cb08e9cd502ef8 100644 (file)
--- a/libarchive/test/test_pax_filename_encoding.c
+++ b/libarchive/test/test_pax_filename_encoding.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
 
 #include <locale.h>
 
@@ -149,7 +149,11 @@ DEFINE_TEST(test_pax_filename_encoding_2)
        archive_entry_free(entry);
 
        assertEqualInt(0, archive_write_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(a);
+#else
        assertEqualInt(0, archive_write_finish(a));
+#endif
 
        /*
         * Now read the entries back.
@@ -175,7 +179,11 @@ DEFINE_TEST(test_pax_filename_encoding_2)
        assertEqualString(longname, archive_entry_pathname(entry));
 
        assertEqualInt(0, archive_read_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_read_finish(a);
+#else
        assertEqualInt(0, archive_read_finish(a));
+#endif
 }
 
 /*
@@ -249,7 +257,11 @@ DEFINE_TEST(test_pax_filename_encoding_3)
        archive_entry_free(entry);
 
        assertEqualInt(0, archive_write_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(a);
+#else
        assertEqualInt(0, archive_write_finish(a));
+#endif
 
        /*
         * Now read the entries back.
@@ -293,5 +305,9 @@ DEFINE_TEST(test_pax_filename_encoding_3)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry));
 
        assertEqualInt(0, archive_read_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_read_finish(a);
+#else
        assertEqualInt(0, archive_read_finish(a));
+#endif
 }

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index cbfd38bf0b50a15163dfab7ccfe67ef9c37d69f3..d374db81390c9d398a04e22e2db735380d887253 100644 (file)
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.5 2008/06/26 11:50:11 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.6 2008/08/10 03:13:42 kientzle Exp $");
 
 DEFINE_TEST(test_read_format_zip)
 {
@@ -51,12 +51,14 @@ DEFINE_TEST(test_read_format_zip)
        assertEqualString("file1", archive_entry_pathname(ae));
        assertEqualInt(1179604289, archive_entry_mtime(ae));
        assertEqualInt(18, archive_entry_size(ae));
+       failure("archive_read_data() returns number of bytes read");
        assertEqualInt(18, archive_read_data(a, buff, 19));
        assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));
        assertA(0 == archive_read_next_header(a, &ae));
        assertEqualString("file2", archive_entry_pathname(ae));
        assertEqualInt(1179605932, archive_entry_mtime(ae));
        assertEqualInt(18, archive_entry_size(ae));
+       failure("file2 has a bad CRC, so reading to end should fail");
        assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19));
        assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));
        assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE);

diff --git a/libarchive/test/test_tar_large.c b/libarchive/test/test_tar_large.c
index df8a1399ad92f3c7bed787f173ba7f239852f513..2ad40197acc34ea91bc6188c167110e1c48be512 100644 (file)
--- a/libarchive/test/test_tar_large.c
+++ b/libarchive/test/test_tar_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.3 2008/08/10 21:14:26 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
@@ -179,7 +179,6 @@ memory_read_skip(struct archive *a, void *private, size_t skip)
 #else
 static off_t
 memory_read_skip(struct archive *a, void *_private, off_t skip)
-#endif
 {
        struct memdata *private = _private;
 
@@ -198,6 +197,7 @@ memory_read_skip(struct archive *a, void *_private, off_t skip)
        }
        return (skip);
 }
+#endif
 
 DEFINE_TEST(test_tar_large)
 {

diff --git a/libarchive/test/test_ustar_filenames.c b/libarchive/test/test_ustar_filenames.c
index 88b4b2c4ac46499587a4a86388505c96ae6bd0e4..5cbb568182651a7cbc829bedc8c6baf729d9fd3d 100644 (file)
--- a/libarchive/test/test_ustar_filenames.c
+++ b/libarchive/test/test_ustar_filenames.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $");
 
 /*
  * Exercise various lengths of filenames in ustar archives.
@@ -111,7 +111,11 @@ test_filename(const char *prefix, int dlen, int flen)
 
        /* Close out the archive. */
        assertA(0 == archive_write_close(a));
-       assertA(0 == archive_write_finish(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(a);
+#else
+       assertEqualInt(0, archive_write_finish(a));
+#endif
 
        /*
         * Now, read the data back.
@@ -153,7 +157,11 @@ test_filename(const char *prefix, int dlen, int flen)
        failure("This fails if entries were written that should not have been written.  dlen=%d, flen=%d", dlen, flen);
        assertEqualInt(1, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-       assert(0 == archive_read_finish(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_read_finish(a);
+#else
+       assertEqualInt(0, archive_read_finish(a));
+#endif
 }
 
 DEFINE_TEST(test_ustar_filenames)

diff --git a/libarchive/test/test_write_disk.c b/libarchive/test/test_write_disk.c
index 42ded91893fa7c6c3f8803d8383188d4968b9857..eb137c3f86e1552316bd36a7a42a7102645814f2 100644 (file)
--- a/libarchive/test/test_write_disk.c
+++ b/libarchive/test/test_write_disk.c
@@ -37,7 +37,11 @@ static void create(struct archive_entry *ae, const char *msg)
        failure("%s", msg);
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(ad);
+#else
        assertEqualInt(0, archive_write_finish(ad));
+#endif
        /* Test the entries on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",
@@ -81,7 +85,11 @@ static void create_reg_file(struct archive_entry *ae, const char *msg)
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(ad);
+#else
        assertEqualInt(0, archive_write_finish(ad));
+#endif
        /* Test the entries on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",
@@ -120,7 +128,11 @@ static void create_reg_file2(struct archive_entry *ae, const char *msg)
                    archive_write_data_block(ad, data + i, 1000, i));
        }
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(ad);
+#else
        assertEqualInt(0, archive_write_finish(ad));
+#endif
        /* Test the entries on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",
@@ -151,7 +163,11 @@ static void create_reg_file3(struct archive_entry *ae, const char *msg)
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualInt(5, archive_write_data(ad, data, sizeof(data)));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(ad);
+#else
        assertEqualInt(0, archive_write_finish(ad));
+#endif
        /* Test the entry on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",
@@ -174,7 +190,11 @@ static void create_reg_file4(struct archive_entry *ae, const char *msg)
        assertEqualInt(ARCHIVE_OK,
            archive_write_data_block(ad, data, sizeof(data), 0));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(ad);
+#else
        assertEqualInt(0, archive_write_finish(ad));
+#endif
        /* Test the entry on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",

diff --git a/libarchive/test/test_write_disk_hardlink.c b/libarchive/test/test_write_disk_hardlink.c
index 098c2851e27f75753b71935a9ff5bbd2e0b3f3f9..45b912ee1eca8bc67216b578c6c888a00c22c39d 100644 (file)
--- a/libarchive/test/test_write_disk_hardlink.c
+++ b/libarchive/test/test_write_disk_hardlink.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
 
 #define UMASK 022
 
@@ -132,7 +132,11 @@ DEFINE_TEST(test_write_disk_hardlink)
        assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
        archive_entry_free(ae);
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(ad);
+#else
        assertEqualInt(0, archive_write_finish(ad));
+#endif
 
        /* Test the entries on disk. */
        assert(0 == stat("link1a", &st));

diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c
index 53eb07cf7d918f6c2a7d7a16a3d56d7fcac9c5b8..8531b54bfa4d82ec184cc108b557f3d93862a6f7 100644 (file)
--- a/libarchive/test/test_write_format_tar_ustar.c
+++ b/libarchive/test/test_write_format_tar_ustar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $");
 
 static int
 is_null(const char *p, size_t l)
@@ -188,7 +188,11 @@ DEFINE_TEST(test_write_format_tar_ustar)
        assertEqualIntA(a, 0, archive_write_header(a, entry));
        archive_entry_free(entry);
 
+#if ARCHIVE_VERSION_NUMBER < 2000000
+       archive_write_finish(a);
+#else
        assert(0 == archive_write_finish(a));
+#endif
 
        /*
         * Verify the archive format.