[Pkg-owncloud-commits] [owncloud-client] 449/498: Csync tests: fix on linux

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 157f59d44a4077394dcdd97ceea73e3fd57741f6
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Aug 5 11:09:27 2015 +0200

    Csync tests: fix on linux
    
    Linux do not iconv to decode filenames
---
 csync/tests/vio_tests/check_vio_ext.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/csync/tests/vio_tests/check_vio_ext.c b/csync/tests/vio_tests/check_vio_ext.c
index 638df65..fbc7ad9 100644
--- a/csync/tests/vio_tests/check_vio_ext.c
+++ b/csync/tests/vio_tests/check_vio_ext.c
@@ -445,12 +445,19 @@ static void check_readdir_bigunicode(void **state)
 
     int files_cnt = 0;
     traverse_dir(state, CSYNC_TEST_DIR, &files_cnt);
-    // Only the directory with good name is returned
     assert_string_equal( sv->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
      );
+
+#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);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git