'Ze fixes

Signed-off-by: Elijah Newren <newren@gmail.com>
newren · Jul 7, 2024 · b54d0b8 · b54d0b8
1 parent 1577810
commit b54d0b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/t/t9391-filter-repo-lib-usage.sh b/t/t9391-filter-repo-lib-usage.sh
@@ -205,7 +205,7 @@ test_expect_success 'lint-history' '
 	)
 '
 
-test_expect_success 'lint-history --refs' '
+test_expect_success !WINDOWS 'lint-history --refs' '
 	test_create_repo lint-history-only-some-refs &&
 	(
 		cd lint-history-only-some-refs &&

diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -1207,7 +1207,7 @@ yes () {
 	done
 }
 
-# Fix some commands on Windows
+# Fix some commands on Windows, and other OS-specific things
 uname_s=$(uname -s)
 case $uname_s in
 *MINGW*)
@@ -1229,14 +1229,16 @@ case $uname_s in
 	test_set_prereq NATIVE_CRLF
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
-	GIT_TEST_CMP=mingw_test_cmp
+	test_set_prereq WINDOWS
+	GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
 	;;
 *CYGWIN*)
 	test_set_prereq POSIXPERM
 	test_set_prereq EXECKEEPSPID
 	test_set_prereq CYGWIN
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
+	test_set_prereq WINDOWS
 	;;
 *)
 	test_set_prereq POSIXPERM