diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-13 19:35:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-13 19:35:28 (GMT) |
| commit | 7810c6b6d6cf91d624216623e2327d7cb63c1c92 (patch) | |
| tree | 373142243f3fedca26f5bcf566692eb3f0745587 /t | |
| parent | 37ee62bc6b60b566e39c8ea9fbf34b23a9a39d2f (diff) | |
| parent | 5b5d53cbe5d67bd86543a4851014fde0837d1344 (diff) | |
| download | git-7810c6b6d6cf91d624216623e2327d7cb63c1c92.zip git-7810c6b6d6cf91d624216623e2327d7cb63c1c92.tar.gz git-7810c6b6d6cf91d624216623e2327d7cb63c1c92.tar.bz2 | |
Merge branch 'rj/test-fixes'
* rj/test-fixes:
t4135-*.sh: Skip the "backslash" tests on cygwin
t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
Conflicts:
t/t3032-merge-recursive-options.sh
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 5 | ||||
| -rwxr-xr-x | t/t6038-merge-text-auto.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index de9ff89..44f5421 100755 --- a/t/t3032-merge-recursive-options.sh +++ b/t/t3032-merge-recursive-options.sh @@ -13,9 +13,12 @@ test_description='merge-recursive options . ./test-lib.sh +test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b +test_have_prereq MINGW && export GREP_OPTIONS=-U + test_expect_success 'setup' ' conflict_hunks () { - sed -n -e " + sed $SED_OPTIONS -n -e " /^<<<</ b conflict b : conflict diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh index 460bf74..d9c2d38 100755 --- a/t/t6038-merge-text-auto.sh +++ b/t/t6038-merge-text-auto.sh @@ -14,7 +14,7 @@ test_description='CRLF merge conflict across text=auto change . ./test-lib.sh -test_have_prereq MINGW && SED_OPTIONS=-b +test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b test_expect_success setup ' git config core.autocrlf false && diff --git a/t/test-lib.sh b/t/test-lib.sh index cb1ca97..42f2f14 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1057,6 +1057,13 @@ case $(uname -s) in # backslashes in pathspec are converted to '/' # exec does not inherit the PID test_set_prereq MINGW + test_set_prereq SED_STRIPS_CR + ;; +*CYGWIN*) + test_set_prereq POSIXPERM + test_set_prereq EXECKEEPSPID + test_set_prereq NOT_MINGW + test_set_prereq SED_STRIPS_CR ;; *) test_set_prereq POSIXPERM |