Use NFD string for Mac OS at test_read_format_zip_filename.

SVN-Revision: 3359

diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c
index f49b2098ad393cc95903485362199c4821065bc6..701fe05e8300e9f5f59de6af8c10fd666347637e 100644 (file)
--- a/libarchive/test/test_read_format_zip_filename.c
+++ b/libarchive/test/test_read_format_zip_filename.c
@@ -245,24 +245,53 @@ test_read_format_zip_filename_UTF8_UTF8(const char *refname)
        /* Verify directory file. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
-       assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f",
+#if defined(__APPLE__)
+       /* Compare NFD string. */
+       assertEqualUTF8String(
+           "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f",
+           archive_entry_pathname(ae));
+#else
+       /* Compare NFC string. */
+       assertEqualUTF8String(
+           "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f",
            archive_entry_pathname(ae));
+#endif
        assertEqualInt(0, archive_entry_size(ae));
 
        /* Verify regular file. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
-       assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+#if defined(__APPLE__)
+       /* Compare NFD string. */
+       assertEqualUTF8String(
+           "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f"
+           "\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\x2e\x74\x78\x74",
+           archive_entry_pathname(ae));
+#else
+       /* Compare NFC string. */
+       assertEqualUTF8String(
+           "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
            "\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\x2e\x74\x78\x74",
            archive_entry_pathname(ae));
+#endif
        assertEqualInt(5, archive_entry_size(ae));
 
        /* Verify regular file. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
-       assertEqualUTF8String("\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+#if defined(__APPLE__)
+       /* Compare NFD string. */
+       assertEqualUTF8String(
+           "\xe8\xa1\xa8\xe3\x81\x9f\xe3\x82\x99\xe3\x82\x88\x2f"
            "\xe6\xbc\xa2\xe5\xad\x97\x2e\x74\x78\x74",
            archive_entry_pathname(ae));
+#else
+       /* Compare NFC string. */
+       assertEqualUTF8String(
+           "\xe8\xa1\xa8\xe3\x81\xa0\xe3\x82\x88\x2f"
+           "\xe6\xbc\xa2\xe5\xad\x97\x2e\x74\x78\x74",
+           archive_entry_pathname(ae));
+#endif
        assertEqualInt(5, archive_entry_size(ae));