From 360b66f5524bedc2fec8cd5bf83688fd31120e65 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Tue, 7 May 2019 14:30:47 +0200 Subject: [PATCH] Fix test for pull request #1180 --- .../test_read_format_zip_7075_utf8_paths.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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)); } -- 2.47.2