projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-reset.txt: Small fix + clarifications.
[git.git]
/
t
/
test-lib.sh
diff --git
a/t/test-lib.sh
b/t/test-lib.sh
index
e62bd04
..
e654155
100755
(executable)
--- a/
t/test-lib.sh
+++ b/
t/test-lib.sh
@@
-5,8
+5,10
@@
# For repeatability, reset the environment to known value.
LANG=C
# For repeatability, reset the environment to known value.
LANG=C
+LC_ALL=C
+PAGER=cat
TZ=UTC
TZ=UTC
-export LANG TZ
+export LANG
LC_ALL PAGER
TZ
unset AUTHOR_DATE
unset AUTHOR_EMAIL
unset AUTHOR_NAME
unset AUTHOR_DATE
unset AUTHOR_EMAIL
unset AUTHOR_NAME
@@
-35,6
+37,7
@@
unset SHA1_FILE_DIRECTORY
error () {
echo "* error: $*"
error () {
echo "* error: $*"
+ trap - exit
exit 1
}
exit 1
}
@@
-62,6
+65,7
@@
do
esac
done
esac
done
+exec 5>&1
if test "$verbose" = "t"
then
exec 4>&2 3>&1
if test "$verbose" = "t"
then
exec 4>&2 3>&1
@@
-72,6
+76,8
@@
fi
test_failure=0
test_count=0
test_failure=0
test_count=0
+trap 'echo >&5 "FATAL: Unexpected exit with code $?"; exit 1' exit
+
# You are not expected to call test_ok_ and test_failure_ directly, use
# the text_expect_* functions instead.
# You are not expected to call test_ok_ and test_failure_ directly, use
# the text_expect_* functions instead.
@@
-87,7
+93,7
@@
test_failure_ () {
say "FAIL $test_count: $1"
shift
echo "$@" | sed -e 's/^/ /'
say "FAIL $test_count: $1"
shift
echo "$@" | sed -e 's/^/ /'
- test "$immediate" = "" ||
exit 1
+ test "$immediate" = "" ||
{ trap - exit; exit 1; }
}
}
@@
-95,15
+101,22
@@
test_debug () {
test "$debug" = "" || eval "$1"
}
test "$debug" = "" || eval "$1"
}
+test_run_ () {
+ eval >&3 2>&4 "$1"
+ eval_ret="$?"
+ return 0
+}
+
test_expect_failure () {
test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-failure"
say >&3 "expecting failure: $2"
test_expect_failure () {
test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-failure"
say >&3 "expecting failure: $2"
- if eval >&3 2>&4 "$2"
+ test_run_ "$2"
+ if [ "$?" = 0 -a "$eval_ret" != 0 ]
then
then
- test_failure_ "$@"
- else
test_ok_ "$1"
test_ok_ "$1"
+ else
+ test_failure_ "$@"
fi
}
fi
}
@@
-111,7
+124,8
@@
test_expect_success () {
test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-success"
say >&3 "expecting success: $2"
test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-success"
say >&3 "expecting success: $2"
- if eval >&3 2>&4 "$2"
+ test_run_ "$2"
+ if [ "$?" = 0 -a "$eval_ret" = 0 ]
then
test_ok_ "$1"
else
then
test_ok_ "$1"
else
@@
-120,6
+134,7
@@
test_expect_success () {
}
test_done () {
}
test_done () {
+ trap - exit
case "$test_failure" in
0)
# We could:
case "$test_failure" in
0)
# We could:
@@
-143,10
+158,16
@@
test_done () {
# Test the binaries we have just built. The tests are kept in
# t/ subdirectory and are run in trash subdirectory.
PATH=$(pwd)/..:$PATH
# Test the binaries we have just built. The tests are kept in
# t/ subdirectory and are run in trash subdirectory.
PATH=$(pwd)/..:$PATH
+GIT_EXEC_PATH=$(pwd)/..
+export GIT_EXEC_PATH
# Test repository
test=trash
rm -fr "$test"
mkdir "$test"
cd "$test"
# Test repository
test=trash
rm -fr "$test"
mkdir "$test"
cd "$test"
-git-init-db 2>/dev/null || error "cannot run git-init-db"
+git-init-db --template=../../templates/blt/ 2>/dev/null ||
+error "cannot run git-init-db"
+
+mv .git/hooks .git/hooks-disabled
+