1 files changed, 11 insertions, 3 deletions

diff --git a/lib/libarchive/test/test_write_format_tar_empty.c b/lib/libarchive/test/test_write_format_tar_empty.c
index 5fb8c8c866986..86bdebc43f14e 100644
--- a/lib/libarchive/test/test_write_format_tar_empty.c
+++ b/lib/libarchive/test/test_write_format_tar_empty.c
@@ -52,8 +52,12 @@ DEFINE_TEST(test_write_format_tar_empty)
 	archive_write_finish(a);
 #endif
 
-	failure("Empty tar archive should be exactly 1024 bytes, was %d.", used);
+#if ARCHIVE_VERSION_STAMP < 1009000
+	/* Earlier versions wrote 0-length files for empty tar archives. */
+	skipping("empty tar archive size");
+#else
 	assert(used == 1024);
+#endif
 	for (i = 0; i < used; i++) {
 		failure("Empty tar archive should be all nulls.");
 		assert(buff[i] == 0);
@@ -75,8 +79,12 @@ DEFINE_TEST(test_write_format_tar_empty)
 	archive_write_finish(a);
 #endif
 
-	failure("Empty tar archive should be exactly 1024 bytes, was %d.", used);
-	assert(used == 1024);
+#if ARCHIVE_VERSION_STAMP < 1009000
+	/* Earlier versions wrote 0-length files for empty tar archives. */
+	skipping("empty tar archive size");
+#else
+	assertEqualInt(used, 1024);
+#endif
 	for (i = 0; i < used; i++) {
 		failure("Empty tar archive should be all nulls.");
 		assert(buff[i] == 0);