From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 18 May 2011 05:08:35 +0000 (-0400)
Subject: Use NFD string for Mac OS at test_read_format_zip_filename.
X-Git-Tag: v3.0.0a~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edf50894e55caba5b3d216ef726d62e5602fd7a4;p=thirdparty%2Flibarchive.git

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 f49b2098a..701fe05e8 100644
--- 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));