thodg/libgit2/tests-clar/revwalk/mergebase.c
-
Show log
Commit
-
Hash : 9094d30b
Author :
Date : 2012-11-23T11:41:56
Reset all static variables to NULL in clar's __cleanup Without this change, any failed assertion in the second (or a later) test inside a test suite has a chance of double deleting memory, resulting in a heap corruption. See #1096 for details. This leaves alone the test cases where we "just" use cl_git_sandbox_init() and cl_git_sandbox_cleanup(). These methods already take good care to not double delete a repository. Fixes #1096
-
tests-clar/revwalk/mergebase.c
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
#include "clar_libgit2.h" #include "vector.h" #include <stdarg.h> static git_repository *_repo; void test_revwalk_mergebase__initialize(void) { cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); } void test_revwalk_mergebase__cleanup(void) { git_repository_free(_repo); _repo = NULL; } void test_revwalk_mergebase__single1(void) { git_oid result, one, two, expected; cl_git_pass(git_oid_fromstr(&one, "c47800c7266a2be04c571c04d5a6614691ea99bd ")); cl_git_pass(git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a")); cl_git_pass(git_oid_fromstr(&expected, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); cl_assert(git_oid_cmp(&result, &expected) == 0); } void test_revwalk_mergebase__single2(void) { git_oid result, one, two, expected; cl_git_pass(git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af")); cl_git_pass(git_oid_fromstr(&two, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750")); cl_git_pass(git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); cl_assert(git_oid_cmp(&result, &expected) == 0); } void test_revwalk_mergebase__merged_branch(void) { git_oid result, one, two, expected; cl_git_pass(git_oid_fromstr(&one, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750")); cl_git_pass(git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a")); cl_git_pass(git_oid_fromstr(&expected, "9fd738e8f7967c078dceed8190330fc8648ee56a")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); cl_assert(git_oid_cmp(&result, &expected) == 0); cl_git_pass(git_merge_base(&result, _repo, &two, &one)); cl_assert(git_oid_cmp(&result, &expected) == 0); } void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void) { git_oid result, one, two; int error; cl_git_pass(git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af")); cl_git_pass(git_oid_fromstr(&two, "e90810b8df3e80c413d903f631643c716887138d")); error = git_merge_base(&result, _repo, &one, &two); cl_git_fail(error); cl_assert_equal_i(GIT_ENOTFOUND, error); } void test_revwalk_mergebase__no_off_by_one_missing(void) { git_oid result, one, two; cl_git_pass(git_oid_fromstr(&one, "1a443023183e3f2bfbef8ac923cd81c1018a18fd")); cl_git_pass(git_oid_fromstr(&two, "9f13f7d0a9402c681f91dc590cf7b5470e6a77d2")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); } static void assert_mergebase_many(const char *expected_sha, int count, ...) { va_list ap; int i; git_oid *oids; git_oid oid, expected; char *partial_oid; git_object *object; oids = git__malloc(count * sizeof(git_oid)); cl_assert(oids != NULL); memset(oids, 0x0, count * sizeof(git_oid)); va_start(ap, count); for (i = 0; i < count; ++i) { partial_oid = va_arg(ap, char *); cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid))); cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT)); git_oid_cpy(&oids[i], git_object_id(object)); git_object_free(object); } va_end(ap); if (expected_sha == NULL) cl_assert_equal_i(GIT_ENOTFOUND, git_merge_base_many(&oid, _repo, oids, count)); else { cl_git_pass(git_merge_base_many(&oid, _repo, oids, count)); cl_git_pass(git_oid_fromstr(&expected, expected_sha)); cl_assert(git_oid_cmp(&expected, &oid) == 0); } git__free(oids); } void test_revwalk_mergebase__many_no_common_ancestor_returns_ENOTFOUND(void) { assert_mergebase_many(NULL, 3, "41bc8c", "e90810", "a65fed"); assert_mergebase_many(NULL, 3, "e90810", "41bc8c", "a65fed"); assert_mergebase_many(NULL, 3, "e90810", "a65fed", "41bc8c"); assert_mergebase_many(NULL, 3, "a65fed", "e90810", "41bc8c"); assert_mergebase_many(NULL, 3, "a65fed", "e90810", "41bc8c"); assert_mergebase_many(NULL, 3, "a65fed", "41bc8c", "e90810"); assert_mergebase_many(NULL, 3, "e90810", "763d71", "a65fed"); } void test_revwalk_mergebase__many_merge_branch(void) { assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "a65fed", "763d71", "849607"); assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "763d71", "e90810", "a65fed"); assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "763d71", "a65fed", "e90810"); assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "a65fed", "763d71", "849607"); assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "a65fed", "849607", "763d71"); assert_mergebase_many("8496071c1b46c854b31185ea97743be6a8774479", 3, "849607", "a65fed", "763d71"); assert_mergebase_many("5b5b025afb0b4c913b4c338a42934a3863bf3644", 5, "5b5b02", "763d71", "a4a7dc", "a65fed", "41bc8c"); } /* * $ git log --graph --all * * commit 763d71aadf09a7951596c9746c024e7eece7c7af * | Author: nulltoken <emeric.fermas@gmail.com> * | Date: Sun Oct 9 12:54:47 2011 +0200 * | * | Add some files into subdirectories * | * | * commit a65fedf39aefe402d3bb6e24df4d4f5fe4547750 * | | Author: Scott Chacon <schacon@gmail.com> * | | Date: Tue Aug 9 19:33:46 2011 -0700 * | | * | * commit be3563ae3f795b2b4353bcce3a527ad0a4f7f644 * | |\ Merge: 9fd738e c47800c * | |/ Author: Scott Chacon <schacon@gmail.com> * |/| Date: Tue May 25 11:58:27 2010 -0700 * | | * | | Merge branch 'br2' * | | * | | * commit e90810b8df3e80c413d903f631643c716887138d * | | | Author: Vicent Marti <tanoku@gmail.com> * | | | Date: Thu Aug 5 18:42:20 2010 +0200 * | | | * | | | Test commit 2 * | | | * | | * commit 6dcf9bf7541ee10456529833502442f385010c3d * | | Author: Vicent Marti <tanoku@gmail.com> * | | Date: Thu Aug 5 18:41:33 2010 +0200 * | | * | | Test commit 1 * | | * | | * commit a4a7dce85cf63874e984719f4fdd239f5145052f * | | |\ Merge: c47800c 9fd738e * | |/ / Author: Scott Chacon <schacon@gmail.com> * |/| / Date: Tue May 25 12:00:23 2010 -0700 * | |/ * | | Merge branch 'master' into br2 * | | * | * commit 9fd738e8f7967c078dceed8190330fc8648ee56a * | | Author: Scott Chacon <schacon@gmail.com> * | | Date: Mon May 24 10:19:19 2010 -0700 * | | * | | a fourth commit * | | * | * commit 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 * | | Author: Scott Chacon <schacon@gmail.com> * | | Date: Mon May 24 10:19:04 2010 -0700 * | | * | | a third commit * | | * * | commit c47800c7266a2be04c571c04d5a6614691ea99bd * |/ Author: Scott Chacon <schacon@gmail.com> * | Date: Tue May 25 11:58:14 2010 -0700 * | * | branch commit one * | * * commit 5b5b025afb0b4c913b4c338a42934a3863bf3644 * | Author: Scott Chacon <schacon@gmail.com> * | Date: Tue May 11 13:38:42 2010 -0700 * | * | another commit * | * * commit 8496071c1b46c854b31185ea97743be6a8774479 * Author: Scott Chacon <schacon@gmail.com> * Date: Sat May 8 16:13:06 2010 -0700 * * testing * * * commit 41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 * | Author: Scott Chacon <schacon@gmail.com> * | Date: Tue May 11 13:40:41 2010 -0700 * | * | packed commit two * | * * commit 5001298e0c09ad9c34e4249bc5801c75e9754fa5 * Author: Scott Chacon <schacon@gmail.com> * Date: Tue May 11 13:40:23 2010 -0700 * * packed commit one */