From: Markus Goetz <markus@woboq.com>
Date: Tue, 4 Jul 2017 13:03:16 +0000 (+0200)
Subject: check_vio_ext: Align with new UTF8 behaviour on macOS
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~704^2^2~37
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7adcb76f682b9df86d2f7caa5af230b29f7d29cc;p=nextcloud-desktop.git

check_vio_ext: Align with new UTF8 behaviour on macOS
---

diff --git a/csync/tests/vio_tests/check_vio_ext.c b/csync/tests/vio_tests/check_vio_ext.c
index f91328767..c34e708c0 100644
--- a/csync/tests/vio_tests/check_vio_ext.c
+++ b/csync/tests/vio_tests/check_vio_ext.c
@@ -434,7 +434,7 @@ static void check_readdir_bigunicode(void **state)
     assert_int_equal(rc, 0);
     SAFE_FREE(p);
 
-    const char *t1 = "goodone/ugly\xEF\xBB\xBF\x32" ".txt";
+    const char *t1 = "goodone/ugly\xEF\xBB\xBF\x32" ".txt"; // file with encoding error
     asprintf( &p, "%s/%s", CSYNC_TEST_DIR, t1 );
     rc = _tmkdir(p, MKDIR_MASK);
     SAFE_FREE(p);
@@ -444,18 +444,10 @@ static void check_readdir_bigunicode(void **state)
     int files_cnt = 0;
     traverse_dir(state, CSYNC_TEST_DIR, &files_cnt);
     const char *expected_result =  "<DIR> C:/tmp/csync_test/goodone"
-#ifndef __APPLE__
-        // On Mac, iconv will not return some files with fancy unicode.
-        // Linux is not so picky about it and return everything and let the sync engine deal with it.
                                    "<DIR> C:/tmp/csync_test/goodone/ugly\xEF\xBB\xBF\x32" ".txt"
-#endif
                                    ;
     assert_string_equal( sv->result, expected_result);
 
-#ifdef __APPLE__
-    // Bad one is recognized though.. !
-    assert_string_equal( sv->ignored_dir, CSYNC_TEST_DIR "/goodone/" "ugly\xEF\xBB\xBF\x32" ".txt");
-#endif
     assert_int_equal(files_cnt, 0);
 }