diff options
| author | Tim Kientzle <kientzle@gmail.com> | 2008-09-01 10:38:22 -0400 |
|---|---|---|
| committer | Tim Kientzle <kientzle@gmail.com> | 2008-09-01 10:38:22 -0400 |
| commit | f5eb945d50b1d12fafd336baed933be71afd247b (patch) | |
| tree | 57a08fde6b7f1fc1b6f73240450513993b35f058 /libarchive/test/test_read_format_gtar_sparse.c | |
| parent | d2322d460982fd7a7fdae236128e90629fc362e2 (diff) | |
| download | libarchive-f5eb945d50b1d12fafd336baed933be71afd247b.tar.gz | |
IFC
SVN-Revision: 193
Diffstat (limited to 'libarchive/test/test_read_format_gtar_sparse.c')
| -rw-r--r-- | libarchive/test/test_read_format_gtar_sparse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c index b7efea5b..a8257f89 100644 --- a/libarchive/test/test_read_format_gtar_sparse.c +++ b/libarchive/test/test_read_format_gtar_sparse.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_gtar_sparse.c,v 1.8 2008/03/12 05:12:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.9 2008/09/01 05:38:33 kientzle Exp $"); struct contents { @@ -248,7 +248,7 @@ verify_archive_file(const char *name, struct archive_contents *ac) assertEqualIntA(a, err, ARCHIVE_EOF); failure("%s: Size returned at EOF must be zero", name); assertEqualInt(actual.s, 0); -#if ARCHIVE_VERSION_STAMP < 1009000 +#if ARCHIVE_VERSION_NUMBER < 1009000 /* libarchive < 1.9 doesn't get this right */ skipping("offset of final sparse chunk"); #else @@ -263,10 +263,10 @@ verify_archive_file(const char *name, struct archive_contents *ac) assertEqualIntA(a, ARCHIVE_EOF, err); assert(0 == archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 - assert(0 == archive_read_finish(a)); -#else +#if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); +#else + assert(0 == archive_read_finish(a)); #endif } @@ -281,7 +281,7 @@ DEFINE_TEST(test_read_format_gtar_sparse) * libarchive < 1.9 doesn't support the newer --posix sparse formats * from GNU tar 1.15 and later. */ -#if ARCHIVE_VERSION_STAMP < 1009000 +#if ARCHIVE_VERSION_NUMBER < 1009000 skipping("read support for GNUtar --posix sparse formats"); #else /* |