diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2011-12-29 15:06:36 +0100 |
|---|---|---|
| committer | Clemens Buchacher <drizzd@aon.at> | 2011-12-30 20:14:05 +0100 |
| commit | ee3f96d4e097026f045022887acaf541ff73687d (patch) | |
| tree | aba52a7ef698a32841c5e27c0688fec267d52a30 /tests-clay | |
| parent | e459253815086d6563d359f480d867557598dabf (diff) | |
| download | libgit2-ee3f96d4e097026f045022887acaf541ff73687d.tar.gz | |
clay: reset expect_idx in diff_more test
For the diff-index tests, the diff_more test will run multiple
times. Reset the expect_idx counter after each test in order to
allow this.
Diffstat (limited to 'tests-clay')
| -rw-r--r-- | tests-clay/object/tree/diff.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/tests-clay/object/tree/diff.c b/tests-clay/object/tree/diff.c index 471e46544..d2d5f754b 100644 --- a/tests-clay/object/tree/diff.c +++ b/tests-clay/object/tree/diff.c @@ -2,7 +2,6 @@ #include "tree.h" #include "repository.h" -static unsigned int expect_idx; static git_repository *repo; static git_tree *atree, *btree; static git_oid aoid, boid; @@ -104,10 +103,17 @@ void test_object_tree_diff__modification(void) cl_must_pass(git_tree_diff(atree, btree, diff_cb, &expect)); } +struct diff_more_data { + git_tree_diff_data expect[3]; + int expect_idx; +}; + static int diff_more_cb(const git_tree_diff_data *diff, void *data) { - git_tree_diff_data *expect = (git_tree_diff_data *) data; - diff_cmp(diff, &expect[expect_idx++]); + struct diff_more_data *more_data = data; + diff_cmp(diff, &more_data->expect[more_data->expect_idx]); + + more_data->expect_idx = (more_data->expect_idx + 1) % ARRAY_SIZE(more_data->expect); return GIT_SUCCESS; } @@ -116,9 +122,10 @@ void test_object_tree_diff__more(void) { char *astr = "814889a078c031f61ed08ab5fa863aea9314344d"; char *bstr = "75057dd4114e74cca1d750d0aee1647c903cb60a"; - git_tree_diff_data expect[3]; + struct diff_more_data more_data; + git_tree_diff_data *expect = more_data.expect; - memset(expect, 0x0, 3 * sizeof(git_tree_diff_data)); + memset(&more_data, 0x0, sizeof(struct diff_more_data)); /* M README */ expect[0].old_attr = 0100644; expect[0].new_attr = 0100644; @@ -146,5 +153,5 @@ void test_object_tree_diff__more(void) cl_must_pass(git_tree_lookup(&atree, repo, &aoid)); cl_must_pass(git_tree_lookup(&btree, repo, &boid)); - cl_must_pass(git_tree_diff(atree, btree, diff_more_cb, expect)); + cl_must_pass(git_tree_diff(atree, btree, diff_more_cb, &more_data)); } |