Import libarchive-2.5.0b.

1 files changed, 12 insertions, 0 deletions

diff --git a/archivers/libarchive/files/tar/test/test_version.c b/archivers/libarchive/files/tar/test/test_version.c
index 5ac6f882f0b..de5e1100bd9 100644
--- a/archivers/libarchive/files/tar/test/test_version.c
+++ b/archivers/libarchive/files/tar/test/test_version.c
@@ -43,6 +43,7 @@ DEFINE_TEST(test_version)
 	q = p = slurpfile(&s, "version.stdout");
 	/* Version message should start with name of program, then space. */
 	assert(s > 6);
+	failure("Version: %s", p);
 	assertEqualMem(q, "bsdtar ", 7);
 	q += 7; s -= 7;
 	/* Version number is a series of digits and periods. */
@@ -51,14 +52,22 @@ DEFINE_TEST(test_version)
 		--s;
 	}
 	/* Version number terminated by space. */
+	failure("Version: %s", p);
 	assert(s > 1);
+	/* Skip a single trailing a,b,c, or d. */
+	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
+		++q;
+	failure("Version: %s", p);
 	assert(*q == ' ');
 	++q; --s;
 	/* Separator. */
+	failure("Version: %s", p);
 	assertEqualMem(q, "- ", 2);
 	q += 2; s -= 2;
 	/* libarchive name and version number */
+	failure("Version: %s", p);
 	assert(s > 11);
+	failure("Version: %s", p);
 	assertEqualMem(q, "libarchive ", 11);
 	q += 11; s -= 11;
 	/* Version number is a series of digits and periods. */
@@ -66,6 +75,9 @@ DEFINE_TEST(test_version)
 		++q;
 		--s;
 	}
+	/* Skip a single trailing a,b,c, or d. */
+	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
+		++q;
 	/* All terminated by a newline. */
 	assert(s >= 1);
 	assertEqualMem(q, "\n", 1);