diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-26 18:29:34 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-26 18:29:34 +0100 |
| commit | dc7efa1aef2d3694e7a1955d746d26013402a21d (patch) | |
| tree | 53fe478631e02e372508d981093c2abace29ce42 /tests/submodule/modify.c | |
| parent | 77b699e0da3d4a4fed742893bd172f3ee7b936d5 (diff) | |
| parent | 591e82952a2835c3d411ee5abec78be3b0816861 (diff) | |
| download | libgit2-dc7efa1aef2d3694e7a1955d746d26013402a21d.tar.gz | |
Merge pull request #2204 from libgit2/rb/submodule-reference-counting
Make submodules externally refcounted
Diffstat (limited to 'tests/submodule/modify.c')
| -rw-r--r-- | tests/submodule/modify.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tests/submodule/modify.c b/tests/submodule/modify.c index e3e4d8aed..1aaa56388 100644 --- a/tests/submodule/modify.c +++ b/tests/submodule/modify.c @@ -21,15 +21,16 @@ void test_submodule_modify__add(void) const char *s; /* re-add existing submodule */ - cl_assert( - git_submodule_add_setup(NULL, g_repo, "whatever", "sm_unchanged", 1) == - GIT_EEXISTS ); + cl_assert_equal_i( + GIT_EEXISTS, + git_submodule_add_setup(NULL, g_repo, "whatever", "sm_unchanged", 1)); /* add a submodule using a gitlink */ cl_git_pass( git_submodule_add_setup(&sm, g_repo, SM_LIBGIT2_URL, SM_LIBGIT2, 1) ); + git_submodule_free(sm); cl_assert(git_path_isfile("submod2/" SM_LIBGIT2 "/.git")); @@ -48,6 +49,7 @@ void test_submodule_modify__add(void) cl_git_pass( git_submodule_add_setup(&sm, g_repo, SM_LIBGIT2_URL, SM_LIBGIT2B, 0) ); + git_submodule_free(sm); cl_assert(git_path_isdir("submod2/" SM_LIBGIT2B "/.git")); cl_assert(git_path_isfile("submod2/" SM_LIBGIT2B "/.git/HEAD")); @@ -95,7 +97,7 @@ void test_submodule_modify__init(void) /* call init and see that settings are copied */ cl_git_pass(git_submodule_foreach(g_repo, init_one_submodule, NULL)); - git_submodule_reload_all(g_repo); + git_submodule_reload_all(g_repo, 1); /* confirm submodule data in config */ cl_git_pass(git_repository_config(&cfg, g_repo)); @@ -159,6 +161,10 @@ void test_submodule_modify__sync(void) cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM3".url")); cl_assert_equal_s(git_submodule_url(sm3), str); git_config_free(cfg); + + git_submodule_free(sm1); + git_submodule_free(sm2); + git_submodule_free(sm3); } void test_submodule_modify__edit_and_save(void) @@ -231,7 +237,7 @@ void test_submodule_modify__edit_and_save(void) cl_assert_equal_i(GIT_SUBMODULE_RECURSE_YES, git_submodule_fetch_recurse_submodules(sm1)); /* call reload and check that the new values are loaded */ - cl_git_pass(git_submodule_reload(sm1)); + cl_git_pass(git_submodule_reload(sm1, 0)); cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm1)); cl_assert_equal_i( @@ -253,16 +259,18 @@ void test_submodule_modify__edit_and_save(void) GIT_SUBMODULE_RECURSE_NO, git_submodule_fetch_recurse_submodules(sm2)); /* set fetchRecurseSubmodules on-demand */ - cl_git_pass(git_submodule_reload(sm1)); + cl_git_pass(git_submodule_reload(sm1, 0)); git_submodule_set_fetch_recurse_submodules(sm1, GIT_SUBMODULE_RECURSE_ONDEMAND); cl_assert_equal_i( GIT_SUBMODULE_RECURSE_ONDEMAND, git_submodule_fetch_recurse_submodules(sm1)); /* call save */ cl_git_pass(git_submodule_save(sm1)); - cl_git_pass(git_submodule_reload(sm1)); + cl_git_pass(git_submodule_reload(sm1, 0)); cl_assert_equal_i( GIT_SUBMODULE_RECURSE_ONDEMAND, git_submodule_fetch_recurse_submodules(sm1)); + git_submodule_free(sm1); + git_submodule_free(sm2); git_repository_free(r2); git__free(old_url); } |