Undo MinGW specific test suite changes that are no longer needed

The test failures are fixed meanwhile for various reasons:

- Path mangling happens less often due to an updated MSYS-1.0.DLL.

- pwd now always reports a Windows-style path (this was introduced in
  4114156a).

- The whitespace breakage in t1003 has mysteriously disappeared (perhaps
  due to a tool upgrade?)

- The work-around in t4116 was fixed in 36adb4ab.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
Johannes Sixt
2009-03-23 09:58:44 +01:00
parent f03a3529db
commit d4eb98cede
6 changed files with 4 additions and 38 deletions

View File

@@ -108,7 +108,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
mkdir git-dir-wt-1.git &&
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
) &&
check_config git-dir-wt-1.git false "$(pwd -W)"
check_config git-dir-wt-1.git false "$(pwd)"
'
test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '

View File

@@ -8,10 +8,6 @@ test_description='git read-tree --prefix test.
. ./test-lib.sh
cmp () {
diff -w "$@"
}
test_expect_success setup '
echo hello >one &&
git update-index --add one &&

View File

@@ -42,8 +42,7 @@ test_expect_success 'apply in reverse' '
git reset --hard second &&
git apply --reverse --binary --index patch &&
git diff >diff &&
: > empty &&
test_cmp empty diff
test_cmp /dev/null diff
'

View File

@@ -107,10 +107,6 @@ test_expect_success 'remove remote' '
)
'
case $(uname -s) in
*MINGW*) pwd() { builtin pwd -W; } ;;
esac
test_expect_success 'remove remote protects non-remote branches' '
(
cd test &&

View File

@@ -4,8 +4,6 @@ test_description='refspec parsing'
. ./test-lib.sh
test_expect=test_expect_success
test_refspec () {
kind=$1 refspec=$2 expect=$3
@@ -21,7 +19,7 @@ test_refspec () {
title="$kind $refspec (invalid)"
test='test_must_fail git ls-remote frotz'
fi
$test_expect "$title" "$test"
test_expect_success "$title" "$test"
}
test_refspec push '' invalid
@@ -51,14 +49,7 @@ test_refspec fetch 'refs/heads/*:refs/remotes/frotz/*'
test_refspec fetch 'refs/heads/*:refs/remotes/frotz' invalid
test_refspec fetch 'refs/heads:refs/remotes/frotz/*' invalid
test_refspec fetch 'refs/heads/master:refs/remotes/frotz/xyzzy'
case $(uname -s) in
*MINGW*) test_expect=test_expect_failure;;
*) test_expect=test_expect_success;;
esac
test_refspec fetch 'refs/heads/master::refs/remotes/frotz/xyzzy' invalid
test_expect=test_expect_success
test_refspec fetch 'refs/heads/maste :refs/remotes/frotz/xyzzy' invalid
test_refspec push 'master~1:refs/remotes/frotz/backup'
@@ -81,16 +72,4 @@ test_refspec fetch ':refs/remotes/frotz/HEAD-to-me'
test_refspec push ':refs/remotes/frotz/delete me' invalid
test_refspec fetch ':refs/remotes/frotz/HEAD to me' invalid
test_refspec fetch 'refs/heads/*/for-linus:refs/remotes/mine/*-blah' invalid
test_refspec push 'refs/heads/*/for-linus:refs/remotes/mine/*-blah' invalid
test_refspec fetch 'refs/heads*/for-linus:refs/remotes/mine/*' invalid
test_refspec push 'refs/heads*/for-linus:refs/remotes/mine/*' invalid
test_refspec fetch 'refs/heads/*/*/for-linus:refs/remotes/mine/*' invalid
test_refspec push 'refs/heads/*/*/for-linus:refs/remotes/mine/*' invalid
test_refspec fetch 'refs/heads/*/for-linus:refs/remotes/mine/*'
test_refspec push 'refs/heads/*/for-linus:refs/remotes/mine/*'
test_done

View File

@@ -207,11 +207,7 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
fi
'
case $(uname -s) in
*MINGW*) test_expect=test_expect_failure;;
*) test_expect=test_expect_success;;
esac
$test_expect 'checkout to detach HEAD with :/message' '
test_expect_success 'checkout to detach HEAD with :/message' '
git checkout -f master && git clean -f &&
git checkout ":/Initial" &&