summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/mailmap/basic.c8
-rw-r--r--tests/mailmap/blame.c1
-rw-r--r--tests/mailmap/parsing.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/mailmap/basic.c b/tests/mailmap/basic.c
index b507407a5..10fc30bdd 100644
--- a/tests/mailmap/basic.c
+++ b/tests/mailmap/basic.c
@@ -15,7 +15,7 @@ const char TEST_MAILMAP[] =
void test_mailmap_basic__initialize(void)
{
- cl_git_pass(git_mailmap_parse(&mailmap, TEST_MAILMAP, sizeof(TEST_MAILMAP)));
+ cl_git_pass(git_mailmap_parse(&mailmap, TEST_MAILMAP, sizeof(TEST_MAILMAP) - 1));
}
void test_mailmap_basic__cleanup(void)
@@ -28,7 +28,7 @@ void test_mailmap_basic__cleanup(void)
void test_mailmap_basic__entry(void)
{
- git_mailmap_entry* entry;
+ const git_mailmap_entry* entry;
cl_assert(git_mailmap_entry_count(mailmap) == 4);
@@ -43,7 +43,7 @@ void test_mailmap_basic__entry(void)
void test_mailmap_basic__lookup_not_found(void)
{
- git_mailmap_entry* entry = git_mailmap_entry_lookup(
+ const git_mailmap_entry* entry = git_mailmap_entry_lookup(
mailmap,
"Whoever",
"doesnotexist@fo.com");
@@ -52,7 +52,7 @@ void test_mailmap_basic__lookup_not_found(void)
void test_mailmap_basic__lookup(void)
{
- git_mailmap_entry* entry = git_mailmap_entry_lookup(
+ const git_mailmap_entry* entry = git_mailmap_entry_lookup(
mailmap,
"Typoed the name once",
"foo@baz.com");
diff --git a/tests/mailmap/blame.c b/tests/mailmap/blame.c
index 2dd309588..45e9812a8 100644
--- a/tests/mailmap/blame.c
+++ b/tests/mailmap/blame.c
@@ -6,7 +6,6 @@
static git_repository *g_repo;
static git_blame *g_blame;
-static git_mailmap *g_mailmap;
void test_mailmap_blame__initialize(void)
{
diff --git a/tests/mailmap/parsing.c b/tests/mailmap/parsing.c
index 3fda25ff7..a81f2f9bf 100644
--- a/tests/mailmap/parsing.c
+++ b/tests/mailmap/parsing.c
@@ -24,7 +24,7 @@ void test_mailmap_parsing__cleanup(void)
static void check_mailmap_entries(
const git_mailmap *mailmap, const mailmap_entry *entries, size_t entries_size)
{
- const mailmap_entry *parsed = NULL;
+ const git_mailmap_entry *parsed = NULL;
size_t idx = 0;
/* Check that the parsed entries match */