From: Martin Matuska <martin.matuska@axelspringer.de>
Date: Tue, 7 May 2019 12:30:47 +0000 (+0200)
Subject: Fix test for pull request #1180
X-Git-Tag: v3.4.0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=360b66f5524bedc2fec8cd5bf83688fd31120e65;p=thirdparty%2Flibarchive.git

Fix test for pull request #1180
---

diff --git a/libarchive/test/test_read_format_zip_7075_utf8_paths.c b/libarchive/test/test_read_format_zip_7075_utf8_paths.c
index e09b87ea5..2fe38df6d 100644
--- a/libarchive/test/test_read_format_zip_7075_utf8_paths.c
+++ b/libarchive/test/test_read_format_zip_7075_utf8_paths.c
@@ -40,15 +40,33 @@ verify(struct archive *a) {
 
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
 	assert((p = archive_entry_pathname_utf8(ae)) != NULL);
+#if defined(__APPLE__)
+	/* Compare NFD string. */
 	assertEqualUTF8String(p, "File 2 - o\xCC\x88.txt");
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(p, "File 2 - \xC3\xB6.txt");
+#endif
 
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
 	assert((p = archive_entry_pathname_utf8(ae)) != NULL);
+#if defined(__APPLE__)
+	/* Compare NFD string. */
 	assertEqualUTF8String(p, "File 3 - a\xCC\x88.txt");
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(p, "File 3 - \xC3\xA4.txt");
+#endif
 
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
 	assert((p = archive_entry_pathname_utf8(ae)) != NULL);
+#if defined(__APPLE__)
+	/* Compare NFD string. */
 	assertEqualUTF8String(p, "File 4 - a\xCC\x8A.txt");
+#else
+	/* Compare NFC string. */
+	assertEqualUTF8String(p, "File 4 - \xC3\xA5.txt");
+#endif
 
 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 }