diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-06-05 14:11:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 14:11:34 +0100 |
| commit | c708e5e51d8f6aae517a861c380861c3caf18eb6 (patch) | |
| tree | 484b5461478ec7b723d3e15ab133092d61910dcd /tests/diff/parse.c | |
| parent | b4290518b112ffc587ecd03a3ac588ded0ddae0e (diff) | |
| parent | cad7a1bad40c302fef02306708f6ce6279680cb4 (diff) | |
| download | libgit2-c708e5e51d8f6aae517a861c380861c3caf18eb6.tar.gz | |
Merge pull request #5541 from libgit2/ethomson/clar_tap
clar: add tap output option
Diffstat (limited to 'tests/diff/parse.c')
| -rw-r--r-- | tests/diff/parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/diff/parse.c b/tests/diff/parse.c index 7cc5433fb..56f2253aa 100644 --- a/tests/diff/parse.c +++ b/tests/diff/parse.c @@ -318,20 +318,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) |