diff options
| author | Russell Belfer <rb@github.com> | 2013-06-24 11:56:35 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-06-24 11:56:35 -0700 |
| commit | f3f4c6b5bea91351a7bdb1d94e76924e76d0fcee (patch) | |
| tree | 1326ac5133e9e0d026652c6bafda567bc91fa0bc /tests-clar/checkout/tree.c | |
| parent | 353a90bedb6e679306f740fd0c1a08fc7934fbaa (diff) | |
| download | libgit2-f3f4c6b5bea91351a7bdb1d94e76924e76d0fcee.tar.gz | |
Fix checkout tests on Windows
Diffstat (limited to 'tests-clar/checkout/tree.c')
| -rw-r--r-- | tests-clar/checkout/tree.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c index 0e65f28c8..e4bfbce06 100644 --- a/tests-clar/checkout/tree.c +++ b/tests-clar/checkout/tree.c @@ -24,6 +24,9 @@ void test_checkout_tree__cleanup(void) g_object = NULL; 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) @@ -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(3, cts.n_updates); - check_file_contents("./alternative/README", "hey there\n"); - check_file_contents("./alternative/branch_file.txt", "hi\nbye!\n"); - check_file_contents("./alternative/new.txt", "my new file\n"); + check_file_contents_nocr("./alternative/README", "hey there\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( "alternative", NULL, GIT_RMDIR_REMOVE_FILES)); |