On Mac OS, compare NFD string instead of NFC string

at test_read_format_zip_filename and test_read_format_cab_filename.

SVN-Revision: 3317

diff --git a/libarchive/test/test_read_format_cab_filename.c b/libarchive/test/test_read_format_cab_filename.c
index 5ea4bc5bef286c201998ed54b730c31eddf7d6e1..3e5deb00d78f77c98315adc3bb6c9c025c6448bb 100644 (file)
--- a/libarchive/test/test_read_format_cab_filename.c
+++ b/libarchive/test/test_read_format_cab_filename.c
@@ -107,16 +107,37 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname)
 
        /* Verify regular file. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &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));
        assertEqualInt(5, archive_entry_size(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));
+       assertEqualInt(5, archive_entry_size(ae));
+#endif
 
        /* Verify regular file. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &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));
 
 

diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c
index 111b71dfa5cae9964a179aac7af0de517d29a45a..9d2c989815a534ad44168e554b71a9fc0174cd0f 100644 (file)
--- a/libarchive/test/test_read_format_zip_filename.c
+++ b/libarchive/test/test_read_format_zip_filename.c
@@ -107,16 +107,36 @@ test_read_format_zip_filename_CP932_UTF8(const char *refname)
 
        /* Verify regular file. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &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));
-       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));