proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-05 17:12:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix checkout tests on Windows

Browse Source
This commit is contained in:
Russell Belfer 2013-06-24 11:56:35 -07:00
parent 353a90bedb
commit f3f4c6b5be
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests-clar/checkout/index.c
View File

@ -26,6 +26,10 @@ void test_checkout_index__initialize(void)
void test_checkout_index__cleanup(void) void test_checkout_index__cleanup(void)
{ {
cl_git_sandbox_cleanup(); cl_git_sandbox_cleanup();
/* try to remove alternative dir */
if (git_path_isdir("alternative"))
git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES);
} }
void test_checkout_index__cannot_checkout_a_bare_repository(void) void test_checkout_index__cannot_checkout_a_bare_repository(void)
@ -576,9 +580,10 @@ void test_checkout_index__target_directory_from_bare(void)
cl_assert_equal_i(0, cts.n_ignored); cl_assert_equal_i(0, cts.n_ignored);
cl_assert_equal_i(3, cts.n_updates); cl_assert_equal_i(3, cts.n_updates);
check_file_contents("./alternative/README", "hey there\n"); /* files will have been filtered if needed, so strip CR */
check_file_contents("./alternative/branch_file.txt", "hi\nbye!\n"); check_file_contents_nocr("./alternative/README", "hey there\n");
check_file_contents("./alternative/new.txt", "my new file\n"); check_file_contents_nocr("./alternative/branch_file.txt", "hi\nbye!\n");
check_file_contents_nocr("./alternative/new.txt", "my new file\n");
cl_git_pass(git_futils_rmdir_r( cl_git_pass(git_futils_rmdir_r(
"alternative", NULL, GIT_RMDIR_REMOVE_FILES)); "alternative", NULL, GIT_RMDIR_REMOVE_FILES));

9
tests-clar/checkout/tree.c
View File

@ -24,6 +24,9 @@ void test_checkout_tree__cleanup(void)
g_object = NULL; g_object = NULL;
cl_git_sandbox_cleanup(); cl_git_sandbox_cleanup();
if (git_path_isdir("alternative"))
git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES);
} }
void test_checkout_tree__cannot_checkout_a_non_treeish(void) void test_checkout_tree__cannot_checkout_a_non_treeish(void)
@ -667,9 +670,9 @@ void test_checkout_tree__target_directory_from_bare(void)
cl_assert_equal_i(0, cts.n_ignored); cl_assert_equal_i(0, cts.n_ignored);
cl_assert_equal_i(3, cts.n_updates); cl_assert_equal_i(3, cts.n_updates);
check_file_contents("./alternative/README", "hey there\n"); check_file_contents_nocr("./alternative/README", "hey there\n");
check_file_contents("./alternative/branch_file.txt", "hi\nbye!\n"); check_file_contents_nocr("./alternative/branch_file.txt", "hi\nbye!\n");
check_file_contents("./alternative/new.txt", "my new file\n"); check_file_contents_nocr("./alternative/new.txt", "my new file\n");
cl_git_pass(git_futils_rmdir_r( cl_git_pass(git_futils_rmdir_r(
"alternative", NULL, GIT_RMDIR_REMOVE_FILES)); "alternative", NULL, GIT_RMDIR_REMOVE_FILES));