fix test failure

diff --git a/Makefile.am b/Makefile.am
index a1a77dfe0d2580bb080ac8c0be52e9527aa45729..525ac0a11d7874d1afeb941e43445cb6cb2aeb2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -898,6 +898,7 @@ libarchive_test_EXTRA_DIST=\
        libarchive/test/test_read_format_warc.warc.uu \
        libarchive/test/test_read_format_zip.zip.uu \
        libarchive/test/test_read_format_zip_7075_utf8_paths.zip.uu \
+       libarchive/test/test_read_format_zip_7z_lzma.zip.uu \
        libarchive/test/test_read_format_zip_bz2_hang.zip.uu \
        libarchive/test/test_read_format_zip_bzip2.zipx.uu \
        libarchive/test/test_read_format_zip_bzip2_multi.zipx.uu \

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index c547eb0c3891aaf9bae693d0cc0c8721476fcbc7..31f66f0127677422f44219398ef9365e5f4f2633 100644 (file)
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -984,19 +984,17 @@ DEFINE_TEST(test_read_format_zip_7z_lzma)
        assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
        assertEqualIntA(a, ARCHIVE_OK,
                archive_read_open_filename(a, refname, 10240));
-
-       while(1) {
-               int res = archive_read_next_header(a, &ae);
-               if (res == ARCHIVE_EOF)
-                       break;
-
-               assertEqualInt(ARCHIVE_OK, res);
-               if (archive_entry_filetype(ae) == AE_IFLNK)
-                       assertEqualString("../samples/abc_measurement_analysis_sample"
-                               "/src/abc_measurement_analysis_sample.py",
-                               archive_entry_symlink(ae));
-       }
-
+       //read directories
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       //read symlink
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualInt(AE_IFLNK, archive_entry_filetype(ae));
+       assertEqualString("../samples/abc_measurement_analysis_sample"
+               "/src/abc_measurement_analysis_sample.py",
+               archive_entry_symlink(ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
 }