diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-05-04 10:20:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 10:20:33 +0100 |
| commit | 1b6ab16fa5ab1b3f827045a3a9181519281f9892 (patch) | |
| tree | 06dd12307c90e8a275b9a065c03e7b536f065713 | |
| parent | 7849e467579f64ccbbfdc4463af97a215d1ac8e3 (diff) | |
| parent | ffd264d9ebcb597d9b07e8c7d773e4ef6dfb6b36 (diff) | |
| download | libgit2-1b6ab16fa5ab1b3f827045a3a9181519281f9892.tar.gz | |
Merge pull request #4232 from pks-t/pks/schroot-test-fixes
tests: repo: fix repo discovery tests on overlayfs
| -rw-r--r-- | tests/repo/discover.c | 2 | ||||
| -rw-r--r-- | tests/repo/open.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/repo/discover.c b/tests/repo/discover.c index abb7bd12b..eadd055e9 100644 --- a/tests/repo/discover.c +++ b/tests/repo/discover.c @@ -33,7 +33,7 @@ static void ensure_repository_discover(const char *start_path, git_buf_attach(&resolved, p_realpath(expected_path, NULL), 0); cl_assert(resolved.size > 0); cl_git_pass(git_path_to_dir(&resolved)); - cl_git_pass(git_repository_discover(&found_path, start_path, 0, ceiling_dirs)); + cl_git_pass(git_repository_discover(&found_path, start_path, 1, ceiling_dirs)); cl_assert_equal_s(found_path.ptr, resolved.ptr); diff --git a/tests/repo/open.c b/tests/repo/open.c index 6114ad2e1..3239b6fec 100644 --- a/tests/repo/open.c +++ b/tests/repo/open.c @@ -398,7 +398,8 @@ void test_repo_open__force_bare(void) cl_git_fail(git_repository_open_bare(&barerepo, "alternate/subdir/sub2")); cl_git_pass(git_repository_open_ext( - &barerepo, "alternate/subdir/sub2", GIT_REPOSITORY_OPEN_BARE, NULL)); + &barerepo, "alternate/subdir/sub2", + GIT_REPOSITORY_OPEN_BARE|GIT_REPOSITORY_OPEN_CROSS_FS, NULL)); cl_assert(git_repository_is_bare(barerepo)); git_repository_free(barerepo); } |