[Pkg-owncloud-commits] [owncloud-client] 461/498: check_vio_ext.c: assert_string_equal is a macro and we cannot have #ifdef in it

[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 499e13377d4cffcd6e573539b62a4e5e8d120655
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 6 10:02:12 2015 +0200

    check_vio_ext.c: assert_string_equal is a macro and we cannot have #ifdef in it
---
 csync/tests/vio_tests/check_vio_ext.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/csync/tests/vio_tests/check_vio_ext.c b/csync/tests/vio_tests/check_vio_ext.c
index fbc7ad9..a77441f 100644
--- a/csync/tests/vio_tests/check_vio_ext.c
+++ b/csync/tests/vio_tests/check_vio_ext.c
@@ -445,14 +445,14 @@ static void check_readdir_bigunicode(void **state)
 
     int files_cnt = 0;
     traverse_dir(state, CSYNC_TEST_DIR, &files_cnt);
-    assert_string_equal( sv->result,
-                         "<DIR> C:/tmp/csync_test/goodone"
+    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"
+        // 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.. !

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