diff --git a/t/t9391-filter-repo-lib-usage.sh b/t/t9391-filter-repo-lib-usage.sh index 192eacff..3a86961c 100755 --- 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 index 5aefbcb5..ee931398 100644 --- 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,6 +1229,7 @@ case $uname_s in test_set_prereq NATIVE_CRLF test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR + test_set_prereq WINDOWS GIT_TEST_CMP=mingw_test_cmp ;; *CYGWIN*) @@ -1237,6 +1238,7 @@ case $uname_s in test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR + test_set_prereq WINDOWS ;; *) test_set_prereq POSIXPERM