summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/test/test_acl_pax.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libarchive/test/test_acl_pax.c')
-rw-r--r--lib/libarchive/test/test_acl_pax.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libarchive/test/test_acl_pax.c b/lib/libarchive/test/test_acl_pax.c
index a40256b..01c36d1 100644
--- a/lib/libarchive/test/test_acl_pax.c
+++ b/lib/libarchive/test/test_acl_pax.c
@@ -386,7 +386,7 @@ compare_acls(struct archive_entry *ae, struct acl_t *acls, int n, int mode)
assert(matched == 1);
}
}
-#if ARCHIVE_VERSION_STAMP < 1009000
+#if ARCHIVE_VERSION_NUMBER < 1009000
/* Known broken before 1.9.0. */
skipping("archive_entry_acl_next() exits with ARCHIVE_EOF");
#else
@@ -446,10 +446,10 @@ DEFINE_TEST(test_acl_pax)
/* Close out the archive. */
assertA(0 == archive_write_close(a));
-#if ARCHIVE_API_VERSION > 1
- assertA(0 == archive_write_finish(a));
-#else
+#if ARCHIVE_VERSION_NUMBER < 2000000
archive_write_finish(a);
+#else
+ assertA(0 == archive_write_finish(a));
#endif
/* Write out the data we generated to a file for manual inspection. */
@@ -509,9 +509,9 @@ DEFINE_TEST(test_acl_pax)
/* Close the archive. */
assertA(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
+ assertA(0 == archive_read_finish(a));
#endif
}
OpenPOWER on IntegriCloud