diff options
| author | kientzle <kientzle@FreeBSD.org> | 2008-09-01 05:38:33 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2008-09-01 05:38:33 +0000 |
| commit | da7b4a0824397b1c724cdf9a9b03b642ef8610ae (patch) | |
| tree | 33ffbad3b60850d7aaaa2e6c79990403e110b2c2 /lib/libarchive/test/test_read_format_gtar_sparse.c | |
| parent | 4f7f14505ade23cf1713dac8e039845e724b1326 (diff) | |
| download | FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.zip FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.tar.gz | |
Style: Use ARCHIVE_VERSION_NUMBER to conditionalize tests on
the particular libarchive version being tested instead of the
deprecated ARCHIVE_API_VERSION and ARCHIVE_VERSION_STAMP macros.
Diffstat (limited to 'lib/libarchive/test/test_read_format_gtar_sparse.c')
| -rw-r--r-- | lib/libarchive/test/test_read_format_gtar_sparse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse.c b/lib/libarchive/test/test_read_format_gtar_sparse.c index f3eb274..4506a3a 100644 --- a/lib/libarchive/test/test_read_format_gtar_sparse.c +++ b/lib/libarchive/test/test_read_format_gtar_sparse.c @@ -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 /* |
