From fb03a223189f418d0767d7d04ff7509dfcfe8394 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 13 Jun 2013 16:31:11 -0700 Subject: [PATCH] Test has to work on case sensitive systems --- tests-clar/index/tests.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests-clar/index/tests.c b/tests-clar/index/tests.c index 53d45a84e..1bc5e6a07 100644 --- a/tests-clar/index/tests.c +++ b/tests-clar/index/tests.c @@ -422,12 +422,15 @@ void test_index_tests__preserves_case(void) git_repository *repo; git_index *index; const git_index_entry *entry; + int index_caps; cl_set_cleanup(&cleanup_myrepo, NULL); cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); cl_git_pass(git_repository_index(&index, repo)); + index_caps = git_index_caps(index); + cl_git_rewritefile("myrepo/test.txt", "hey there\n"); cl_git_pass(git_index_add_bypath(index, "test.txt")); @@ -435,15 +438,23 @@ void test_index_tests__preserves_case(void) cl_git_rewritefile("myrepo/TEST.txt", "hello again\n"); cl_git_pass(git_index_add_bypath(index, "TEST.txt")); - cl_assert(git_index_entrycount(index) == 1); + if (index_caps & GIT_INDEXCAP_IGNORE_CASE) + cl_assert_equal_i(1, (int)git_index_entrycount(index)); + else + cl_assert_equal_i(2, (int)git_index_entrycount(index)); /* Test access by path instead of index */ cl_assert((entry = git_index_get_bypath(index, "test.txt", 0)) != NULL); - cl_assert((entry = git_index_get_bypath(index, "TEST.txt", 0)) != NULL); - /* The path should *not* have changed without an explicit remove */ cl_assert(git__strcmp(entry->path, "test.txt") == 0); + cl_assert((entry = git_index_get_bypath(index, "TEST.txt", 0)) != NULL); + if (index_caps & GIT_INDEXCAP_IGNORE_CASE) + /* The path should *not* have changed without an explicit remove */ + cl_assert(git__strcmp(entry->path, "test.txt") == 0); + else + cl_assert(git__strcmp(entry->path, "TEST.txt") == 0); + git_index_free(index); git_repository_free(repo); }