summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-05-28 13:49:38 +0200
committerVicent Marti <vicent@github.com>2014-05-28 13:49:38 +0200
commitab882e21b4805f826b91763e50b05c21b634b9b2 (patch)
tree150c889ff2547ab9776144230f57fee26ff8b4c4
parent63e8c3fde26c20c36c3d850d48e1d94a437318cf (diff)
parent3ac1ff42d7cfa8ac981a37712863419c071f2640 (diff)
downloadlibgit2-ab882e21b4805f826b91763e50b05c21b634b9b2.tar.gz
Merge pull request #2385 from karipe/development
Fix compile error on Visual Studio
-rw-r--r--tests/diff/workdir.c4
-rw-r--r--tests/repo/pathspec.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c
index f82bb00e8..963be9481 100644
--- a/tests/diff/workdir.c
+++ b/tests/diff/workdir.c
@@ -1610,8 +1610,8 @@ void test_diff_workdir__binary_detection(void)
int i;
git_buf data[10] = {
{ "1234567890", 0, 0 }, /* 0 - all ascii text control */
- { "Åü†HøπΩ", 0, 0 }, /* 1 - UTF-8 multibyte text */
- { "\xEF\xBB\xBFÜ⤒ƒ8£€", 0, 0 }, /* 2 - UTF-8 with BOM */
+ { "\xC3\x85\xC3\xBC\xE2\x80\xA0\x48\xC3\xB8\xCF\x80\xCE\xA9", 0, 0 }, /* 1 - UTF-8 multibyte text */
+ { "\xEF\xBB\xBF\xC3\x9C\xE2\xA4\x92\xC6\x92\x38\xC2\xA3\xE2\x82\xAC", 0, 0 }, /* 2 - UTF-8 with BOM */
{ STR999Z, 0, 1000 }, /* 3 - ASCII with NUL at 1000 */
{ STR3999Z, 0, 4000 }, /* 4 - ASCII with NUL at 4000 */
{ STR4000 STR3999Z "x", 0, 8001 }, /* 5 - ASCII with NUL at 8000 */
diff --git a/tests/repo/pathspec.c b/tests/repo/pathspec.c
index 334066b67..5b86662bc 100644
--- a/tests/repo/pathspec.c
+++ b/tests/repo/pathspec.c
@@ -167,7 +167,7 @@ void test_repo_pathspec__workdir4(void)
cl_git_pass(git_pathspec_match_workdir(&m, g_repo, 0, ps));
cl_assert_equal_sz(13, git_pathspec_match_list_entrycount(m));
- cl_assert_equal_s("这", git_pathspec_match_list_entry(m, 12));
+ cl_assert_equal_s("\xE8\xBF\x99", git_pathspec_match_list_entry(m, 12));
git_pathspec_match_list_free(m);
git_pathspec_free(ps);