Merge pull request libgit2#4232 from pks-t/pks/schroot-test-fixes

ethomson · web-flow · commit 1b6ab16fa5ab · 2017-05-04T10:20:33.000+01:00
tests: repo: fix repo discovery tests on overlayfs
diff --git 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
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,8 @@ void test_repo_open__force_bare(void)`
`398`	`398`	`cl_git_fail(git_repository_open_bare(&barerepo, "alternate/subdir/sub2"));`
`399`	`399`
`400`	`400`	`cl_git_pass(git_repository_open_ext(`
`401`		`- &barerepo, "alternate/subdir/sub2", GIT_REPOSITORY_OPEN_BARE, NULL));`
	`401`	`+ &barerepo, "alternate/subdir/sub2",`
	`402`	`+ GIT_REPOSITORY_OPEN_BARE\|GIT_REPOSITORY_OPEN_CROSS_FS, NULL));`
`402`	`403`	`cl_assert(git_repository_is_bare(barerepo));`
`403`	`404`	`git_repository_free(barerepo);`
`404`	`405`	`}`