summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/test/test_read_format_gtar_sparse.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libarchive/test/test_read_format_gtar_sparse.c')
-rw-r--r--lib/libarchive/test/test_read_format_gtar_sparse.c10
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
/*
OpenPOWER on IntegriCloud