Commit 78cd966aafe6617142a359c2d79a8cb46621fb77

Ben Straub 2012-07-31T16:24:04

Checkout: fix crlf tests under win32.

diff --git a/tests-clar/checkout/checkout.c b/tests-clar/checkout/checkout.c
index 9551cba..3a27fe5 100644
--- a/tests-clar/checkout/checkout.c
+++ b/tests-clar/checkout/checkout.c
@@ -8,7 +8,7 @@ static git_repository *g_repo;
 
 void test_checkout_checkout__initialize(void)
 {
-	const char *attributes = "*.txt text eol=cr\n";
+	const char *attributes = "* text eol=lf\n";
 
 	g_repo = cl_git_sandbox_init("testrepo");
 	cl_git_mkfile("./testrepo/.gitattributes", attributes);
@@ -54,11 +54,16 @@ void test_checkout_checkout__crlf(void)
 {
 	const char *attributes =
 		"branch_file.txt text eol=crlf\n"
-		"README text eol=cr\n"
 		"new.txt text eol=lf\n";
+	const char *expected_readme_text =
+#ifdef GIT_WIN32
+		"hey there\r\n";
+#else
+		"hey there\n";
+#endif
 	cl_git_mkfile("./testrepo/.gitattributes", attributes);
 	cl_git_pass(git_checkout_head(g_repo, NULL, NULL));
-	 test_file_contents("./testrepo/README", "hey there\n"); 
+	 test_file_contents("./testrepo/README", expected_readme_text); 
 	 test_file_contents("./testrepo/new.txt", "my new file\n"); 
 	 test_file_contents("./testrepo/branch_file.txt", "hi\r\nbye!\r\n"); 
 }