Merge pull request libgit2#3529 from mgorny/fix-checkout-test-umask

carlosmn · carlosmn · commit 8febe654be29 · 2015-12-06T18:11:37.000+01:00
checkout test: Apply umask to file-mode test as well
diff --git a/tests/checkout/index.c b/tests/checkout/index.c
@@ -298,7 +298,7 @@ void test_checkout_index__options_dir_modes(void)
 
 	/* File-mode test, since we're on the 'dir' branch */
 	cl_git_pass(p_stat("./testrepo/a/b.txt", &st));
-	cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE, "%07o");
+	cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE & ~um, "%07o");
 
 	git_commit_free(commit);
 }

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ void test_checkout_index__options_dir_modes(void)`
`298`	`298`
`299`	`299`	`/* File-mode test, since we're on the 'dir' branch */`
`300`	`300`	`cl_git_pass(p_stat("./testrepo/a/b.txt", &st));`
`301`		`- cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE, "%07o");`
	`301`	`+ cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE & ~um, "%07o");`
`302`	`302`
`303`	`303`	`git_commit_free(commit);`
`304`	`304`	`}`