clar: include the function nameethomson/clar_tap

2 files changed, 15 insertions, 14 deletions

diff --git a/tests/diff/parse.c b/tests/diff/parse.c
index b004d1e23..8bb95c4e3 100644
--- a/tests/diff/parse.c
+++ b/tests/diff/parse.c
@@ -319,20 +319,20 @@ void test_diff_parse__patch_roundtrip_succeeds(void)
 	git_buf_dispose(&diffbuf);
 }
 
-#define cl_assert_equal_i_src(i1,i2,file,line) clar__assert_equal(file,line,#i1 " != " #i2, 1, "%d", (int)(i1), (int)(i2))
+#define cl_assert_equal_i_src(i1,i2,file,func,line) clar__assert_equal(file,func,line,#i1 " != " #i2, 1, "%d", (int)(i1), (int)(i2))
 
-static void cl_git_assert_lineinfo_(int old_lineno, int new_lineno, int num_lines, git_patch *patch, size_t hunk_idx, size_t line_idx, const char *file, int lineno)
+static void cl_git_assert_lineinfo_(int old_lineno, int new_lineno, int num_lines, git_patch *patch, size_t hunk_idx, size_t line_idx, const char *file, const char *func, int lineno)
 {
 	const git_diff_line *line;
 
-	cl_git_expect(git_patch_get_line_in_hunk(&line, patch, hunk_idx, line_idx), 0, file, lineno);
-	cl_assert_equal_i_src(old_lineno, line->old_lineno, file, lineno);
-	cl_assert_equal_i_src(new_lineno, line->new_lineno, file, lineno);
-	cl_assert_equal_i_src(num_lines, line->num_lines, file, lineno);
+	cl_git_expect(git_patch_get_line_in_hunk(&line, patch, hunk_idx, line_idx), 0, file, func, lineno);
+	cl_assert_equal_i_src(old_lineno, line->old_lineno, file, func, lineno);
+	cl_assert_equal_i_src(new_lineno, line->new_lineno, file, func, lineno);
+	cl_assert_equal_i_src(num_lines, line->num_lines, file, func, lineno);
 }
 
 #define cl_git_assert_lineinfo(old, new, num, p, h, l) \
-	cl_git_assert_lineinfo_(old,new,num,p,h,l,__FILE__,__LINE__)
+	cl_git_assert_lineinfo_(old,new,num,p,h,l,__FILE__,__func__,__LINE__)
 
 
 void test_diff_parse__issue4672(void)
diff --git a/tests/diff/submodules.c b/tests/diff/submodules.c
index 8899d3f9c..93223ef7d 100644
--- a/tests/diff/submodules.c
+++ b/tests/diff/submodules.c
@@ -18,7 +18,8 @@ void test_diff_submodules__cleanup(void)
 #define get_buf_ptr(buf) ((buf)->asize ? (buf)->ptr : NULL)
 
 static void check_diff_patches_at_line(
-	git_diff *diff, const char **expected, const char *file, int line)
+	git_diff *diff, const char **expected,
+	const char *file, const char *func, int line)
 {
 	const git_diff_delta *delta;
 	git_patch *patch = NULL;
@@ -30,34 +31,34 @@ static void check_diff_patches_at_line(
 		cl_assert((delta = git_patch_get_delta(patch)) != NULL);
 
 		if (delta->status == GIT_DELTA_UNMODIFIED) {
-			cl_assert_at_line(expected[d] == NULL, file, line);
+			cl_assert_at_line(expected[d] == NULL, file, func, line);
 			continue;
 		}
 
 		if (expected[d] && !strcmp(expected[d], "<SKIP>"))
 			continue;
 		if (expected[d] && !strcmp(expected[d], "<UNTRACKED>")) {
-			cl_assert_at_line(delta->status == GIT_DELTA_UNTRACKED, file, line);
+			cl_assert_at_line(delta->status == GIT_DELTA_UNTRACKED, file, func, line);
 			continue;
 		}
 		if (expected[d] && !strcmp(expected[d], "<END>")) {
 			cl_git_pass(git_patch_to_buf(&buf, patch));
-			cl_assert_at_line(!strcmp(expected[d], "<END>"), file, line);
+			cl_assert_at_line(!strcmp(expected[d], "<END>"), file, func, line);
 		}
 
 		cl_git_pass(git_patch_to_buf(&buf, patch));
 
 		clar__assert_equal(
-			file, line, "expected diff did not match actual diff", 1,
+			file, func, line, "expected diff did not match actual diff", 1,
 			"%s", expected[d], get_buf_ptr(&buf));
 		git_buf_dispose(&buf);
 	}
 
-	cl_assert_at_line(expected[d] && !strcmp(expected[d], "<END>"), file, line);
+	cl_assert_at_line(expected[d] && !strcmp(expected[d], "<END>"), file, func, line);
 }
 
 #define check_diff_patches(diff, exp) \
-	check_diff_patches_at_line(diff, exp, __FILE__, __LINE__)
+	check_diff_patches_at_line(diff, exp, __FILE__, __func__, __LINE__)
 
 void test_diff_submodules__unmodified_submodule(void)
 {