Commit 326c9fc2ed2164e6840847fd073d8894ab1032c9

Michał Górny 2015-12-01T20:41:23

checkout test: Apply umask to file-mode test as well Fix the file-mode test to expect system umask being applied to the created file as well (it is currently applied to the directory only). This fixes the test on systems where umask != 022. Signed-off-by: Michał Górny <mgorny@gentoo.org>

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/tests/checkout/index.c b/tests/checkout/index.c
index 9fa9018..8af3e56 100644
--- 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);
 }