2005-05-14 05:50:32 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
test-lib.sh: optionally output to test-results/$TEST.out, too
When tests are run in parallel and a few tests fail, it does not help
that the output of the terminal is totally confusing, as you rarely know
which test which line came from.
So introduce the option '--tee' which triggers that the output of the
tests will be written to t/test-results/$TEST.out in addition to the
terminal, where $TEST is the basename of the script.
Unfortunately, there seems to be no way to redirect a given file
descriptor to a specified subprocess in POSIX shell, only redirection
to a file is supported via 'exec > $FILE'.
At least with bash, one might think that 'exec >($COMMAND)' would work
as intended, but it does not.
The common way to work around the lack of proper tools support is to
work with named pipes, alas, one of our most beloved platforms does not
really support named pipes. Besides, we would need a pipe for every
script, as the whole point of this patch is to allow parallel execution.
Therefore, we handle the redirection in the following way: when '--tee'
was passed to the test script, the variable GIT_TEST_TEE_STARTED is set
(to avoid triggering that code path again) and the script is started
_again_, in a subshell, redirected to the command "tee".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-03 23:26:12 +00:00
|
|
|
# if --tee was passed, write the output not only to the terminal, but
|
|
|
|
# additionally to the file test-results/$BASENAME.out, too.
|
|
|
|
case "$GIT_TEST_TEE_STARTED, $* " in
|
|
|
|
done,*)
|
|
|
|
# do not redirect again
|
|
|
|
;;
|
2009-02-03 23:26:26 +00:00
|
|
|
*' --tee '*|*' --va'*)
|
test-lib.sh: optionally output to test-results/$TEST.out, too
When tests are run in parallel and a few tests fail, it does not help
that the output of the terminal is totally confusing, as you rarely know
which test which line came from.
So introduce the option '--tee' which triggers that the output of the
tests will be written to t/test-results/$TEST.out in addition to the
terminal, where $TEST is the basename of the script.
Unfortunately, there seems to be no way to redirect a given file
descriptor to a specified subprocess in POSIX shell, only redirection
to a file is supported via 'exec > $FILE'.
At least with bash, one might think that 'exec >($COMMAND)' would work
as intended, but it does not.
The common way to work around the lack of proper tools support is to
work with named pipes, alas, one of our most beloved platforms does not
really support named pipes. Besides, we would need a pipe for every
script, as the whole point of this patch is to allow parallel execution.
Therefore, we handle the redirection in the following way: when '--tee'
was passed to the test script, the variable GIT_TEST_TEE_STARTED is set
(to avoid triggering that code path again) and the script is started
_again_, in a subshell, redirected to the command "tee".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-03 23:26:12 +00:00
|
|
|
mkdir -p test-results
|
|
|
|
BASE=test-results/$(basename "$0" .sh)
|
|
|
|
(GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
|
|
|
|
echo $? > $BASE.exit) | tee $BASE.out
|
|
|
|
test "$(cat $BASE.exit)" = 0
|
|
|
|
exit
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2008-03-07 03:04:26 +00:00
|
|
|
# Keep the original TERM for say_color
|
|
|
|
ORIGINAL_TERM=$TERM
|
|
|
|
|
2005-05-14 05:50:32 +00:00
|
|
|
# For repeatability, reset the environment to known value.
|
|
|
|
LANG=C
|
2005-10-10 04:58:02 +00:00
|
|
|
LC_ALL=C
|
2005-08-11 02:10:01 +00:00
|
|
|
PAGER=cat
|
2005-05-14 05:50:32 +00:00
|
|
|
TZ=UTC
|
2008-03-07 03:04:26 +00:00
|
|
|
TERM=dumb
|
|
|
|
export LANG LC_ALL PAGER TERM TZ
|
2006-07-11 19:01:54 +00:00
|
|
|
EDITOR=:
|
|
|
|
VISUAL=:
|
2007-07-31 05:16:40 +00:00
|
|
|
unset GIT_EDITOR
|
2005-05-14 05:50:32 +00:00
|
|
|
unset AUTHOR_DATE
|
|
|
|
unset AUTHOR_EMAIL
|
|
|
|
unset AUTHOR_NAME
|
|
|
|
unset COMMIT_AUTHOR_EMAIL
|
|
|
|
unset COMMIT_AUTHOR_NAME
|
2007-04-29 01:40:28 +00:00
|
|
|
unset EMAIL
|
2005-05-14 05:50:32 +00:00
|
|
|
unset GIT_ALTERNATE_OBJECT_DIRECTORIES
|
|
|
|
unset GIT_AUTHOR_DATE
|
2006-02-11 03:11:23 +00:00
|
|
|
GIT_AUTHOR_EMAIL=author@example.com
|
|
|
|
GIT_AUTHOR_NAME='A U Thor'
|
2005-12-15 20:54:00 +00:00
|
|
|
unset GIT_COMMITTER_DATE
|
2006-02-11 03:11:23 +00:00
|
|
|
GIT_COMMITTER_EMAIL=committer@example.com
|
|
|
|
GIT_COMMITTER_NAME='C O Mitter'
|
2005-05-14 05:50:32 +00:00
|
|
|
unset GIT_DIFF_OPTS
|
|
|
|
unset GIT_DIR
|
2007-06-06 07:10:42 +00:00
|
|
|
unset GIT_WORK_TREE
|
2005-05-14 05:50:32 +00:00
|
|
|
unset GIT_EXTERNAL_DIFF
|
|
|
|
unset GIT_INDEX_FILE
|
|
|
|
unset GIT_OBJECT_DIRECTORY
|
2008-05-20 06:49:26 +00:00
|
|
|
unset GIT_CEILING_DIRECTORIES
|
2005-05-14 05:50:32 +00:00
|
|
|
unset SHA1_FILE_DIRECTORIES
|
|
|
|
unset SHA1_FILE_DIRECTORY
|
2007-02-04 05:45:47 +00:00
|
|
|
GIT_MERGE_VERBOSITY=5
|
|
|
|
export GIT_MERGE_VERBOSITY
|
2006-02-11 03:11:23 +00:00
|
|
|
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
|
|
|
|
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
|
2006-07-11 19:01:54 +00:00
|
|
|
export EDITOR VISUAL
|
2008-03-12 21:36:36 +00:00
|
|
|
GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2007-04-24 18:21:47 +00:00
|
|
|
# Protect ourselves from common misconfiguration to export
|
|
|
|
# CDPATH into the environment
|
|
|
|
unset CDPATH
|
|
|
|
|
2006-09-22 22:35:20 +00:00
|
|
|
case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
|
2006-09-02 16:23:48 +00:00
|
|
|
1|2|true)
|
|
|
|
echo "* warning: Some tests will not work if GIT_TRACE" \
|
|
|
|
"is set as to trace on STDERR ! *"
|
|
|
|
echo "* warning: Please set GIT_TRACE to something" \
|
|
|
|
"other than 1, 2 or true ! *"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2005-05-14 05:50:32 +00:00
|
|
|
# Each test should start with something like this, after copyright notices:
|
|
|
|
#
|
|
|
|
# test_description='Description of this test...
|
|
|
|
# This test checks if command xyzzy does the right thing...
|
|
|
|
# '
|
|
|
|
# . ./test-lib.sh
|
2008-03-07 03:04:26 +00:00
|
|
|
[ "x$ORIGINAL_TERM" != "xdumb" ] && (
|
|
|
|
TERM=$ORIGINAL_TERM &&
|
|
|
|
export TERM &&
|
|
|
|
[ -t 1 ] &&
|
|
|
|
tput bold >/dev/null 2>&1 &&
|
|
|
|
tput setaf 1 >/dev/null 2>&1 &&
|
|
|
|
tput sgr0 >/dev/null 2>&1
|
|
|
|
) &&
|
2007-10-24 20:03:38 +00:00
|
|
|
color=t
|
2005-05-14 05:50:32 +00:00
|
|
|
|
|
|
|
while test "$#" -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-d|--d|--de|--deb|--debu|--debug)
|
|
|
|
debug=t; shift ;;
|
2005-05-14 07:24:27 +00:00
|
|
|
-i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate)
|
|
|
|
immediate=t; shift ;;
|
2008-06-17 01:29:02 +00:00
|
|
|
-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
|
2009-02-18 19:17:27 +00:00
|
|
|
GIT_TEST_LONG=t; export GIT_TEST_LONG; shift ;;
|
2005-05-14 05:50:32 +00:00
|
|
|
-h|--h|--he|--hel|--help)
|
2007-11-10 14:17:25 +00:00
|
|
|
help=t; shift ;;
|
2005-05-14 05:50:32 +00:00
|
|
|
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
|
|
|
|
verbose=t; shift ;;
|
2007-10-24 20:03:39 +00:00
|
|
|
-q|--q|--qu|--qui|--quie|--quiet)
|
|
|
|
quiet=t; shift ;;
|
2007-10-24 20:03:38 +00:00
|
|
|
--no-color)
|
2008-02-27 19:28:45 +00:00
|
|
|
color=; shift ;;
|
2006-02-18 12:01:18 +00:00
|
|
|
--no-python)
|
2006-11-20 08:49:31 +00:00
|
|
|
# noop now...
|
|
|
|
shift ;;
|
2009-02-03 23:25:59 +00:00
|
|
|
--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
|
2009-02-03 23:26:26 +00:00
|
|
|
valgrind=t; verbose=t; shift ;;
|
test-lib.sh: optionally output to test-results/$TEST.out, too
When tests are run in parallel and a few tests fail, it does not help
that the output of the terminal is totally confusing, as you rarely know
which test which line came from.
So introduce the option '--tee' which triggers that the output of the
tests will be written to t/test-results/$TEST.out in addition to the
terminal, where $TEST is the basename of the script.
Unfortunately, there seems to be no way to redirect a given file
descriptor to a specified subprocess in POSIX shell, only redirection
to a file is supported via 'exec > $FILE'.
At least with bash, one might think that 'exec >($COMMAND)' would work
as intended, but it does not.
The common way to work around the lack of proper tools support is to
work with named pipes, alas, one of our most beloved platforms does not
really support named pipes. Besides, we would need a pipe for every
script, as the whole point of this patch is to allow parallel execution.
Therefore, we handle the redirection in the following way: when '--tee'
was passed to the test script, the variable GIT_TEST_TEE_STARTED is set
(to avoid triggering that code path again) and the script is started
_again_, in a subshell, redirected to the command "tee".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-03 23:26:12 +00:00
|
|
|
--tee)
|
|
|
|
shift ;; # was handled already
|
2005-05-14 05:50:32 +00:00
|
|
|
*)
|
2009-06-01 12:14:40 +00:00
|
|
|
echo "error: unknown test option '$1'" >&2; exit 1 ;;
|
2005-05-14 05:50:32 +00:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2007-10-24 20:03:38 +00:00
|
|
|
if test -n "$color"; then
|
|
|
|
say_color () {
|
2008-03-07 03:04:26 +00:00
|
|
|
(
|
|
|
|
TERM=$ORIGINAL_TERM
|
|
|
|
export TERM
|
2007-10-24 20:03:38 +00:00
|
|
|
case "$1" in
|
|
|
|
error) tput bold; tput setaf 1;; # bold red
|
|
|
|
skip) tput bold; tput setaf 2;; # bold green
|
|
|
|
pass) tput setaf 2;; # green
|
|
|
|
info) tput setaf 3;; # brown
|
2007-10-24 20:03:39 +00:00
|
|
|
*) test -n "$quiet" && return;;
|
2007-10-24 20:03:38 +00:00
|
|
|
esac
|
|
|
|
shift
|
2008-10-12 20:13:59 +00:00
|
|
|
printf "* %s" "$*"
|
2007-10-24 20:03:38 +00:00
|
|
|
tput sgr0
|
2008-10-09 22:07:10 +00:00
|
|
|
echo
|
2008-03-07 03:04:26 +00:00
|
|
|
)
|
2007-10-24 20:03:38 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
say_color() {
|
2007-10-24 20:03:39 +00:00
|
|
|
test -z "$1" && test -n "$quiet" && return
|
2007-10-24 20:03:38 +00:00
|
|
|
shift
|
|
|
|
echo "* $*"
|
|
|
|
}
|
|
|
|
fi
|
|
|
|
|
|
|
|
error () {
|
|
|
|
say_color error "error: $*"
|
2009-06-01 12:14:41 +00:00
|
|
|
GIT_EXIT_OK=t
|
2007-10-24 20:03:38 +00:00
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
|
|
|
say () {
|
|
|
|
say_color info "$*"
|
|
|
|
}
|
|
|
|
|
2007-11-10 14:17:25 +00:00
|
|
|
test "${test_description}" != "" ||
|
|
|
|
error "Test script did not set test_description."
|
|
|
|
|
|
|
|
if test "$help" = "t"
|
|
|
|
then
|
|
|
|
echo "$test_description"
|
|
|
|
exit 0
|
|
|
|
fi
|
|
|
|
|
2005-08-11 03:56:21 +00:00
|
|
|
exec 5>&1
|
2005-05-14 05:50:32 +00:00
|
|
|
if test "$verbose" = "t"
|
|
|
|
then
|
|
|
|
exec 4>&2 3>&1
|
|
|
|
else
|
|
|
|
exec 4>/dev/null 3>/dev/null
|
|
|
|
fi
|
|
|
|
|
|
|
|
test_failure=0
|
|
|
|
test_count=0
|
2008-02-01 09:50:53 +00:00
|
|
|
test_fixed=0
|
|
|
|
test_broken=0
|
2008-06-08 14:04:33 +00:00
|
|
|
test_success=0
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2008-02-27 19:28:45 +00:00
|
|
|
die () {
|
2009-06-01 12:14:41 +00:00
|
|
|
code=$?
|
|
|
|
if test -n "$GIT_EXIT_OK"
|
|
|
|
then
|
|
|
|
exit $code
|
|
|
|
else
|
|
|
|
echo >&5 "FATAL: Unexpected exit with code $code"
|
|
|
|
exit 1
|
|
|
|
fi
|
2008-02-27 19:28:45 +00:00
|
|
|
}
|
|
|
|
|
2009-06-01 12:14:41 +00:00
|
|
|
GIT_EXIT_OK=
|
2009-01-19 23:43:26 +00:00
|
|
|
trap 'die' EXIT
|
2005-08-11 16:00:40 +00:00
|
|
|
|
2008-05-04 05:37:54 +00:00
|
|
|
# The semantics of the editor variables are that of invoking
|
|
|
|
# sh -c "$EDITOR \"$@\"" files ...
|
|
|
|
#
|
|
|
|
# If our trash directory contains shell metacharacters, they will be
|
|
|
|
# interpreted if we just set $EDITOR directly, so do a little dance with
|
|
|
|
# environment variables to work around this.
|
|
|
|
#
|
|
|
|
# In particular, quoting isn't enough, as the path may contain the same quote
|
2008-06-12 22:35:59 +00:00
|
|
|
# that we're using.
|
2008-05-04 05:37:54 +00:00
|
|
|
test_set_editor () {
|
|
|
|
FAKE_EDITOR="$1"
|
|
|
|
export FAKE_EDITOR
|
|
|
|
VISUAL='"$FAKE_EDITOR"'
|
|
|
|
export VISUAL
|
|
|
|
}
|
|
|
|
|
2006-12-29 10:25:04 +00:00
|
|
|
test_tick () {
|
|
|
|
if test -z "${test_tick+set}"
|
|
|
|
then
|
2007-01-06 10:16:07 +00:00
|
|
|
test_tick=1112911993
|
2006-12-29 10:25:04 +00:00
|
|
|
else
|
|
|
|
test_tick=$(($test_tick + 60))
|
|
|
|
fi
|
2007-01-06 10:16:07 +00:00
|
|
|
GIT_COMMITTER_DATE="$test_tick -0700"
|
|
|
|
GIT_AUTHOR_DATE="$test_tick -0700"
|
2006-12-29 10:25:04 +00:00
|
|
|
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
|
|
|
|
}
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2009-01-27 22:34:48 +00:00
|
|
|
# Call test_commit with the arguments "<message> [<file> [<contents>]]"
|
|
|
|
#
|
|
|
|
# This will commit a file with the given contents and the given commit
|
|
|
|
# message. It will also add a tag with <message> as name.
|
|
|
|
#
|
|
|
|
# Both <file> and <contents> default to <message>.
|
|
|
|
|
|
|
|
test_commit () {
|
2009-02-04 05:46:33 +00:00
|
|
|
file=${2:-"$1.t"}
|
2009-01-27 22:34:48 +00:00
|
|
|
echo "${3-$1}" > "$file" &&
|
|
|
|
git add "$file" &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "$1" &&
|
|
|
|
git tag "$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Call test_merge with the arguments "<message> <commit>", where <commit>
|
|
|
|
# can be a tag pointing to the commit-to-merge.
|
|
|
|
|
|
|
|
test_merge () {
|
|
|
|
test_tick &&
|
|
|
|
git merge -m "$1" "$2" &&
|
|
|
|
git tag "$1"
|
|
|
|
}
|
|
|
|
|
2009-02-28 20:12:57 +00:00
|
|
|
# This function helps systems where core.filemode=false is set.
|
|
|
|
# Use it instead of plain 'chmod +x' to set or unset the executable bit
|
|
|
|
# of a file in the working directory and add it to the index.
|
|
|
|
|
|
|
|
test_chmod () {
|
|
|
|
chmod "$@" &&
|
|
|
|
git update-index --add "--chmod=$@"
|
|
|
|
}
|
|
|
|
|
2009-03-01 20:04:46 +00:00
|
|
|
# Use test_set_prereq to tell that a particular prerequisite is available.
|
|
|
|
# The prerequisite can later be checked for in two ways:
|
|
|
|
#
|
|
|
|
# - Explicitly using test_have_prereq.
|
|
|
|
#
|
|
|
|
# - Implicitly by specifying the prerequisite tag in the calls to
|
|
|
|
# test_expect_{success,failure,code}.
|
|
|
|
#
|
|
|
|
# The single parameter is the prerequisite tag (a simple word, in all
|
|
|
|
# capital letters by convention).
|
|
|
|
|
|
|
|
test_set_prereq () {
|
|
|
|
satisfied="$satisfied$1 "
|
|
|
|
}
|
|
|
|
satisfied=" "
|
|
|
|
|
|
|
|
test_have_prereq () {
|
|
|
|
case $satisfied in
|
|
|
|
*" $1 "*)
|
|
|
|
: yes, have it ;;
|
|
|
|
*)
|
|
|
|
! : nope ;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
2005-05-14 07:24:27 +00:00
|
|
|
# You are not expected to call test_ok_ and test_failure_ directly, use
|
|
|
|
# the text_expect_* functions instead.
|
|
|
|
|
|
|
|
test_ok_ () {
|
2009-02-05 19:59:27 +00:00
|
|
|
test_success=$(($test_success + 1))
|
2007-10-24 20:03:38 +00:00
|
|
|
say_color "" " ok $test_count: $@"
|
2005-05-14 05:50:32 +00:00
|
|
|
}
|
|
|
|
|
2005-05-14 07:24:27 +00:00
|
|
|
test_failure_ () {
|
2009-02-05 19:59:27 +00:00
|
|
|
test_failure=$(($test_failure + 1))
|
2007-10-24 20:03:38 +00:00
|
|
|
say_color error "FAIL $test_count: $1"
|
2005-07-23 02:09:34 +00:00
|
|
|
shift
|
|
|
|
echo "$@" | sed -e 's/^/ /'
|
2009-06-01 12:14:41 +00:00
|
|
|
test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
|
2005-05-14 07:24:27 +00:00
|
|
|
}
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_known_broken_ok_ () {
|
|
|
|
test_fixed=$(($test_fixed+1))
|
|
|
|
say_color "" " FIXED $test_count: $@"
|
|
|
|
}
|
|
|
|
|
|
|
|
test_known_broken_failure_ () {
|
|
|
|
test_broken=$(($test_broken+1))
|
|
|
|
say_color skip " still broken $test_count: $@"
|
|
|
|
}
|
2005-05-14 07:24:27 +00:00
|
|
|
|
|
|
|
test_debug () {
|
2005-08-11 05:53:27 +00:00
|
|
|
test "$debug" = "" || eval "$1"
|
2005-05-14 05:50:32 +00:00
|
|
|
}
|
|
|
|
|
2005-08-11 03:56:21 +00:00
|
|
|
test_run_ () {
|
|
|
|
eval >&3 2>&4 "$1"
|
|
|
|
eval_ret="$?"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2006-12-29 01:58:00 +00:00
|
|
|
test_skip () {
|
2009-02-05 20:20:56 +00:00
|
|
|
test_count=$(($test_count+1))
|
2006-12-29 01:58:00 +00:00
|
|
|
to_skip=
|
|
|
|
for skp in $GIT_SKIP_TESTS
|
|
|
|
do
|
2009-02-05 20:20:56 +00:00
|
|
|
case $this_test.$test_count in
|
2006-12-29 01:58:00 +00:00
|
|
|
$skp)
|
|
|
|
to_skip=t
|
|
|
|
esac
|
|
|
|
done
|
2009-03-01 20:04:46 +00:00
|
|
|
if test -z "$to_skip" && test -n "$prereq" &&
|
|
|
|
! test_have_prereq "$prereq"
|
|
|
|
then
|
|
|
|
to_skip=t
|
|
|
|
fi
|
2006-12-29 01:58:00 +00:00
|
|
|
case "$to_skip" in
|
|
|
|
t)
|
2007-10-24 20:03:38 +00:00
|
|
|
say_color skip >&3 "skipping test: $@"
|
|
|
|
say_color skip "skip $test_count: $1"
|
2006-12-29 01:58:00 +00:00
|
|
|
: true
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
false
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
2005-05-14 05:50:32 +00:00
|
|
|
test_expect_failure () {
|
2009-03-01 20:04:46 +00:00
|
|
|
test "$#" = 3 && { prereq=$1; shift; } || prereq=
|
2005-08-11 05:53:27 +00:00
|
|
|
test "$#" = 2 ||
|
2009-03-01 20:04:46 +00:00
|
|
|
error "bug in the test script: not 2 or 3 parameters to test-expect-failure"
|
2006-12-29 01:58:00 +00:00
|
|
|
if ! test_skip "$@"
|
2005-05-14 05:50:32 +00:00
|
|
|
then
|
2008-02-01 09:50:53 +00:00
|
|
|
say >&3 "checking known breakage: $2"
|
2006-12-29 01:58:00 +00:00
|
|
|
test_run_ "$2"
|
2008-02-01 09:50:53 +00:00
|
|
|
if [ "$?" = 0 -a "$eval_ret" = 0 ]
|
2006-12-29 01:58:00 +00:00
|
|
|
then
|
2008-02-01 09:50:53 +00:00
|
|
|
test_known_broken_ok_ "$1"
|
2006-12-29 01:58:00 +00:00
|
|
|
else
|
2009-06-01 12:14:41 +00:00
|
|
|
test_known_broken_failure_ "$1"
|
2006-12-29 01:58:00 +00:00
|
|
|
fi
|
2005-05-14 05:50:32 +00:00
|
|
|
fi
|
2006-10-07 19:27:46 +00:00
|
|
|
echo >&3 ""
|
2005-05-14 05:50:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success () {
|
2009-03-01 20:04:46 +00:00
|
|
|
test "$#" = 3 && { prereq=$1; shift; } || prereq=
|
2005-08-11 05:53:27 +00:00
|
|
|
test "$#" = 2 ||
|
2009-03-01 20:04:46 +00:00
|
|
|
error "bug in the test script: not 2 or 3 parameters to test-expect-success"
|
2006-12-29 01:58:00 +00:00
|
|
|
if ! test_skip "$@"
|
2005-05-14 05:50:32 +00:00
|
|
|
then
|
2006-12-29 01:58:00 +00:00
|
|
|
say >&3 "expecting success: $2"
|
|
|
|
test_run_ "$2"
|
|
|
|
if [ "$?" = 0 -a "$eval_ret" = 0 ]
|
|
|
|
then
|
|
|
|
test_ok_ "$1"
|
|
|
|
else
|
|
|
|
test_failure_ "$@"
|
|
|
|
fi
|
2005-05-14 05:50:32 +00:00
|
|
|
fi
|
2006-10-07 19:27:46 +00:00
|
|
|
echo >&3 ""
|
2005-05-14 05:50:32 +00:00
|
|
|
}
|
|
|
|
|
2005-12-03 10:40:39 +00:00
|
|
|
test_expect_code () {
|
2009-03-01 20:04:46 +00:00
|
|
|
test "$#" = 4 && { prereq=$1; shift; } || prereq=
|
2005-12-03 10:40:39 +00:00
|
|
|
test "$#" = 3 ||
|
2009-03-01 20:04:46 +00:00
|
|
|
error "bug in the test script: not 3 or 4 parameters to test-expect-code"
|
2006-12-29 01:58:00 +00:00
|
|
|
if ! test_skip "$@"
|
2005-12-03 10:40:39 +00:00
|
|
|
then
|
2006-12-29 01:58:00 +00:00
|
|
|
say >&3 "expecting exit code $1: $3"
|
|
|
|
test_run_ "$3"
|
|
|
|
if [ "$?" = 0 -a "$eval_ret" = "$1" ]
|
|
|
|
then
|
|
|
|
test_ok_ "$2"
|
|
|
|
else
|
|
|
|
test_failure_ "$@"
|
|
|
|
fi
|
2005-12-03 10:40:39 +00:00
|
|
|
fi
|
2006-10-07 19:27:46 +00:00
|
|
|
echo >&3 ""
|
2005-12-03 10:40:39 +00:00
|
|
|
}
|
|
|
|
|
2008-06-19 18:18:03 +00:00
|
|
|
# test_external runs external test scripts that provide continuous
|
|
|
|
# test output about their progress, and succeeds/fails on
|
|
|
|
# zero/non-zero exit code. It outputs the test output on stdout even
|
|
|
|
# in non-verbose mode, and announces the external script with "* run
|
|
|
|
# <n>: ..." before running it. When providing relative paths, keep in
|
|
|
|
# mind that all scripts run in "trash directory".
|
|
|
|
# Usage: test_external description command arguments...
|
|
|
|
# Example: test_external 'Perl API' perl ../path/to/test.pl
|
|
|
|
test_external () {
|
2009-03-01 20:04:46 +00:00
|
|
|
test "$#" = 4 && { prereq=$1; shift; } || prereq=
|
|
|
|
test "$#" = 3 ||
|
|
|
|
error >&5 "bug in the test script: not 3 or 4 parameters to test_external"
|
2008-06-19 18:18:03 +00:00
|
|
|
descr="$1"
|
|
|
|
shift
|
|
|
|
if ! test_skip "$descr" "$@"
|
|
|
|
then
|
|
|
|
# Announce the script to reduce confusion about the
|
|
|
|
# test output that follows.
|
2009-02-05 20:20:56 +00:00
|
|
|
say_color "" " run $test_count: $descr ($*)"
|
2008-06-19 18:18:03 +00:00
|
|
|
# Run command; redirect its stderr to &4 as in
|
|
|
|
# test_run_, but keep its stdout on our stdout even in
|
|
|
|
# non-verbose mode.
|
|
|
|
"$@" 2>&4
|
|
|
|
if [ "$?" = 0 ]
|
|
|
|
then
|
|
|
|
test_ok_ "$descr"
|
|
|
|
else
|
|
|
|
test_failure_ "$descr" "$@"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
# Like test_external, but in addition tests that the command generated
|
|
|
|
# no output on stderr.
|
|
|
|
test_external_without_stderr () {
|
|
|
|
# The temporary file has no (and must have no) security
|
|
|
|
# implications.
|
|
|
|
tmp="$TMPDIR"; if [ -z "$tmp" ]; then tmp=/tmp; fi
|
|
|
|
stderr="$tmp/git-external-stderr.$$.tmp"
|
|
|
|
test_external "$@" 4> "$stderr"
|
|
|
|
[ -f "$stderr" ] || error "Internal error: $stderr disappeared."
|
|
|
|
descr="no stderr: $1"
|
|
|
|
shift
|
|
|
|
say >&3 "expecting no stderr from previous command"
|
|
|
|
if [ ! -s "$stderr" ]; then
|
|
|
|
rm "$stderr"
|
|
|
|
test_ok_ "$descr"
|
|
|
|
else
|
|
|
|
if [ "$verbose" = t ]; then
|
|
|
|
output=`echo; echo Stderr is:; cat "$stderr"`
|
|
|
|
else
|
|
|
|
output=
|
|
|
|
fi
|
|
|
|
# rm first in case test_failure exits.
|
|
|
|
rm "$stderr"
|
|
|
|
test_failure_ "$descr" "$@" "$output"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2008-02-28 21:09:30 +00:00
|
|
|
# This is not among top-level (test_expect_success | test_expect_failure)
|
|
|
|
# but is a prefix that can be used in the test script, like:
|
|
|
|
#
|
|
|
|
# test_expect_success 'complain and die' '
|
|
|
|
# do something &&
|
|
|
|
# do something else &&
|
|
|
|
# test_must_fail git checkout ../outerspace
|
|
|
|
# '
|
|
|
|
#
|
|
|
|
# Writing this as "! git checkout ../outerspace" is wrong, because
|
|
|
|
# the failure could be due to a segv. We want a controlled failure.
|
|
|
|
|
|
|
|
test_must_fail () {
|
|
|
|
"$@"
|
2008-07-12 15:47:51 +00:00
|
|
|
test $? -gt 0 -a $? -le 129 -o $? -gt 192
|
2008-02-28 21:09:30 +00:00
|
|
|
}
|
|
|
|
|
2008-03-12 21:36:36 +00:00
|
|
|
# test_cmp is a helper function to compare actual and expected output.
|
|
|
|
# You can use it like:
|
|
|
|
#
|
|
|
|
# test_expect_success 'foo works' '
|
|
|
|
# echo expected >expected &&
|
|
|
|
# foo >actual &&
|
|
|
|
# test_cmp expected actual
|
|
|
|
# '
|
|
|
|
#
|
|
|
|
# This could be written as either "cmp" or "diff -u", but:
|
|
|
|
# - cmp's output is not nearly as easy to read as diff -u
|
|
|
|
# - not all diff versions understand "-u"
|
|
|
|
|
|
|
|
test_cmp() {
|
|
|
|
$GIT_TEST_CMP "$@"
|
|
|
|
}
|
|
|
|
|
2008-01-31 21:59:11 +00:00
|
|
|
# Most tests can use the created repository, but some may need to create more.
|
2006-02-17 21:33:26 +00:00
|
|
|
# Usage: test_create_repo <directory>
|
|
|
|
test_create_repo () {
|
|
|
|
test "$#" = 1 ||
|
|
|
|
error "bug in the test script: not 1 parameter to test-create-repo"
|
|
|
|
owd=`pwd`
|
|
|
|
repo="$1"
|
2008-08-08 09:26:28 +00:00
|
|
|
mkdir -p "$repo"
|
2006-02-17 21:33:26 +00:00
|
|
|
cd "$repo" || error "Cannot setup test environment"
|
2009-04-21 09:21:59 +00:00
|
|
|
"$GIT_EXEC_PATH/git-init" "--template=$TEST_DIRECTORY/../templates/blt/" >&3 2>&4 ||
|
2007-01-12 21:01:46 +00:00
|
|
|
error "cannot run git init -- have you built things yet?"
|
2006-02-17 21:33:26 +00:00
|
|
|
mv .git/hooks .git/hooks-disabled
|
|
|
|
cd "$owd"
|
|
|
|
}
|
2007-06-07 07:04:01 +00:00
|
|
|
|
2005-05-14 05:50:32 +00:00
|
|
|
test_done () {
|
2009-06-01 12:14:41 +00:00
|
|
|
GIT_EXIT_OK=t
|
2008-06-08 14:04:33 +00:00
|
|
|
test_results_dir="$TEST_DIRECTORY/test-results"
|
|
|
|
mkdir -p "$test_results_dir"
|
2009-03-13 16:26:36 +00:00
|
|
|
test_results_path="$test_results_dir/${0%.sh}-$$"
|
2008-06-08 14:04:33 +00:00
|
|
|
|
|
|
|
echo "total $test_count" >> $test_results_path
|
|
|
|
echo "success $test_success" >> $test_results_path
|
|
|
|
echo "fixed $test_fixed" >> $test_results_path
|
|
|
|
echo "broken $test_broken" >> $test_results_path
|
|
|
|
echo "failed $test_failure" >> $test_results_path
|
|
|
|
echo "" >> $test_results_path
|
2008-02-01 09:50:53 +00:00
|
|
|
|
|
|
|
if test "$test_fixed" != 0
|
|
|
|
then
|
|
|
|
say_color pass "fixed $test_fixed known breakage(s)"
|
|
|
|
fi
|
|
|
|
if test "$test_broken" != 0
|
|
|
|
then
|
|
|
|
say_color error "still have $test_broken known breakage(s)"
|
2008-02-03 08:23:02 +00:00
|
|
|
msg="remaining $(($test_count-$test_broken)) test(s)"
|
|
|
|
else
|
|
|
|
msg="$test_count test(s)"
|
2008-02-01 09:50:53 +00:00
|
|
|
fi
|
2005-05-14 05:50:32 +00:00
|
|
|
case "$test_failure" in
|
2005-12-10 01:32:18 +00:00
|
|
|
0)
|
2008-02-03 08:23:02 +00:00
|
|
|
say_color pass "passed all $msg"
|
Enable parallel tests
On multiprocessor machines, or with I/O heavy tests (that leave the
CPU waiting a lot), it makes sense to parallelize the tests.
However, care has to be taken that the different jobs use different
trash directories.
This commit does so, by creating the trash directories with a suffix
that is unique with regard to the test, as it is the test's base name.
Further, the trash directory is removed in the test itself if
everything went fine, so that the trash directories do not
pile up only to be removed at the very end.
If a test failed, the trash directory is not removed. Chances are
that the exact error message is lost in the clutter, but you can still
see what test failed from the name of the trash directory, and repeat
the test (without -j).
If all was good, you will see the aggregated results.
Suggestions to simplify this commit came from Junio and René.
There still is an issue with tests that want to run a server process and
listen to a fixed port (http and svn) --- they cannot run in parallel but
this patch does not address this issue.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-08 11:08:37 +00:00
|
|
|
|
|
|
|
test -d "$remove_trash" &&
|
|
|
|
cd "$(dirname "$remove_trash")" &&
|
|
|
|
rm -rf "$(basename "$remove_trash")"
|
|
|
|
|
2005-05-14 05:50:32 +00:00
|
|
|
exit 0 ;;
|
|
|
|
|
|
|
|
*)
|
2008-02-03 08:23:02 +00:00
|
|
|
say_color error "failed $test_failure among $msg"
|
2005-05-14 05:50:32 +00:00
|
|
|
exit 1 ;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
|
|
|
# Test the binaries we have just built. The tests are kept in
|
2008-06-14 18:14:12 +00:00
|
|
|
# t/ subdirectory and are run in 'trash directory' subdirectory.
|
2008-06-08 14:04:33 +00:00
|
|
|
TEST_DIRECTORY=$(pwd)
|
2009-02-03 23:25:59 +00:00
|
|
|
if test -z "$valgrind"
|
|
|
|
then
|
2009-03-16 17:03:12 +00:00
|
|
|
if test -z "$GIT_TEST_INSTALLED"
|
|
|
|
then
|
|
|
|
PATH=$TEST_DIRECTORY/..:$PATH
|
|
|
|
GIT_EXEC_PATH=$TEST_DIRECTORY/..
|
|
|
|
else
|
|
|
|
GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
|
|
|
|
error "Cannot run git from $GIT_TEST_INSTALLED."
|
|
|
|
PATH=$GIT_TEST_INSTALLED:$TEST_DIRECTORY/..:$PATH
|
|
|
|
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
|
|
|
|
fi
|
2009-02-03 23:25:59 +00:00
|
|
|
else
|
|
|
|
make_symlink () {
|
|
|
|
test -h "$2" &&
|
|
|
|
test "$1" = "$(readlink "$2")" || {
|
|
|
|
# be super paranoid
|
|
|
|
if mkdir "$2".lock
|
|
|
|
then
|
|
|
|
rm -f "$2" &&
|
|
|
|
ln -s "$1" "$2" &&
|
|
|
|
rm -r "$2".lock
|
|
|
|
else
|
|
|
|
while test -d "$2".lock
|
|
|
|
do
|
|
|
|
say "Waiting for lock on $2."
|
|
|
|
sleep 1
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
make_valgrind_symlink () {
|
|
|
|
# handle only executables
|
|
|
|
test -x "$1" || return
|
|
|
|
|
|
|
|
base=$(basename "$1")
|
|
|
|
symlink_target=$TEST_DIRECTORY/../$base
|
|
|
|
# do not override scripts
|
|
|
|
if test -x "$symlink_target" &&
|
|
|
|
test ! -d "$symlink_target" &&
|
|
|
|
test "#!" != "$(head -c 2 < "$symlink_target")"
|
|
|
|
then
|
|
|
|
symlink_target=../valgrind.sh
|
|
|
|
fi
|
2009-02-03 23:26:08 +00:00
|
|
|
case "$base" in
|
|
|
|
*.sh|*.perl)
|
|
|
|
symlink_target=../unprocessed-script
|
|
|
|
esac
|
2009-02-03 23:25:59 +00:00
|
|
|
# create the link, or replace it if it is out of date
|
|
|
|
make_symlink "$symlink_target" "$GIT_VALGRIND/bin/$base" || exit
|
|
|
|
}
|
|
|
|
|
|
|
|
# override all git executables in TEST_DIRECTORY/..
|
|
|
|
GIT_VALGRIND=$TEST_DIRECTORY/valgrind
|
|
|
|
mkdir -p "$GIT_VALGRIND"/bin
|
|
|
|
for file in $TEST_DIRECTORY/../git* $TEST_DIRECTORY/../test-*
|
|
|
|
do
|
|
|
|
make_valgrind_symlink $file
|
|
|
|
done
|
2009-02-03 23:26:08 +00:00
|
|
|
OLDIFS=$IFS
|
|
|
|
IFS=:
|
|
|
|
for path in $PATH
|
|
|
|
do
|
|
|
|
ls "$path"/git-* 2> /dev/null |
|
|
|
|
while read file
|
|
|
|
do
|
|
|
|
make_valgrind_symlink "$file"
|
|
|
|
done
|
|
|
|
done
|
|
|
|
IFS=$OLDIFS
|
2009-02-03 23:25:59 +00:00
|
|
|
PATH=$GIT_VALGRIND/bin:$PATH
|
|
|
|
GIT_EXEC_PATH=$GIT_VALGRIND/bin
|
|
|
|
export GIT_VALGRIND
|
|
|
|
fi
|
2006-12-19 08:18:09 +00:00
|
|
|
GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
|
2008-02-06 10:11:53 +00:00
|
|
|
unset GIT_CONFIG
|
|
|
|
GIT_CONFIG_NOSYSTEM=1
|
|
|
|
GIT_CONFIG_NOGLOBAL=1
|
|
|
|
export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL
|
2005-12-08 05:52:28 +00:00
|
|
|
|
2006-07-03 21:16:32 +00:00
|
|
|
GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
|
|
|
|
export GITPERLLIB
|
2005-12-11 04:55:32 +00:00
|
|
|
test -d ../templates/blt || {
|
|
|
|
error "You haven't built things yet, have you?"
|
|
|
|
}
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2007-02-25 00:59:52 +00:00
|
|
|
if ! test -x ../test-chmtime; then
|
|
|
|
echo >&2 'You need to build test-chmtime:'
|
|
|
|
echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2008-02-24 19:40:45 +00:00
|
|
|
. ../GIT-BUILD-OPTIONS
|
|
|
|
|
2005-05-14 05:50:32 +00:00
|
|
|
# Test repository
|
Enable parallel tests
On multiprocessor machines, or with I/O heavy tests (that leave the
CPU waiting a lot), it makes sense to parallelize the tests.
However, care has to be taken that the different jobs use different
trash directories.
This commit does so, by creating the trash directories with a suffix
that is unique with regard to the test, as it is the test's base name.
Further, the trash directory is removed in the test itself if
everything went fine, so that the trash directories do not
pile up only to be removed at the very end.
If a test failed, the trash directory is not removed. Chances are
that the exact error message is lost in the clutter, but you can still
see what test failed from the name of the trash directory, and repeat
the test (without -j).
If all was good, you will see the aggregated results.
Suggestions to simplify this commit came from Junio and René.
There still is an issue with tests that want to run a server process and
listen to a fixed port (http and svn) --- they cannot run in parallel but
this patch does not address this issue.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-08 11:08:37 +00:00
|
|
|
test="trash directory.$(basename "$0" .sh)"
|
2008-08-21 07:49:12 +00:00
|
|
|
test ! -z "$debug" || remove_trash="$TEST_DIRECTORY/$test"
|
2008-03-19 04:58:01 +00:00
|
|
|
rm -fr "$test" || {
|
2009-06-01 12:14:41 +00:00
|
|
|
GIT_EXIT_OK=t
|
2008-03-19 04:58:01 +00:00
|
|
|
echo >&5 "FATAL: Cannot prepare test area"
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
2008-05-04 05:38:00 +00:00
|
|
|
test_create_repo "$test"
|
2008-05-31 21:11:21 +00:00
|
|
|
# Use -P to resolve symlinks in our working directory so that the cwd
|
|
|
|
# in subprocesses like git equals our $PWD (for pathname comparisons).
|
|
|
|
cd -P "$test" || exit 1
|
2006-12-29 01:58:00 +00:00
|
|
|
|
2009-02-05 19:59:27 +00:00
|
|
|
this_test=${0##*/}
|
|
|
|
this_test=${this_test%%-*}
|
2006-12-29 01:58:00 +00:00
|
|
|
for skp in $GIT_SKIP_TESTS
|
|
|
|
do
|
|
|
|
to_skip=
|
|
|
|
for skp in $GIT_SKIP_TESTS
|
|
|
|
do
|
|
|
|
case "$this_test" in
|
|
|
|
$skp)
|
|
|
|
to_skip=t
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
case "$to_skip" in
|
|
|
|
t)
|
2007-10-24 20:03:38 +00:00
|
|
|
say_color skip >&3 "skipping test $this_test altogether"
|
|
|
|
say_color skip "skip all tests in $this_test"
|
2006-12-29 01:58:00 +00:00
|
|
|
test_done
|
|
|
|
esac
|
|
|
|
done
|
2009-03-11 20:17:26 +00:00
|
|
|
|
|
|
|
# Fix some commands on Windows
|
|
|
|
case $(uname -s) in
|
|
|
|
*MINGW*)
|
|
|
|
# Windows has its own (incompatible) sort and find
|
|
|
|
sort () {
|
|
|
|
/usr/bin/sort "$@"
|
|
|
|
}
|
|
|
|
find () {
|
|
|
|
/usr/bin/find "$@"
|
|
|
|
}
|
2009-03-14 21:21:27 +00:00
|
|
|
sum () {
|
|
|
|
md5sum "$@"
|
|
|
|
}
|
2009-03-13 22:35:24 +00:00
|
|
|
# git sees Windows-style pwd
|
|
|
|
pwd () {
|
|
|
|
builtin pwd -W
|
|
|
|
}
|
2009-03-13 21:55:27 +00:00
|
|
|
# no POSIX permissions
|
2009-03-13 22:00:15 +00:00
|
|
|
# backslashes in pathspec are converted to '/'
|
2009-03-25 12:21:15 +00:00
|
|
|
# exec does not inherit the PID
|
2009-03-13 21:55:27 +00:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
test_set_prereq POSIXPERM
|
2009-03-13 22:00:15 +00:00
|
|
|
test_set_prereq BSLASHPSPEC
|
2009-03-25 12:21:15 +00:00
|
|
|
test_set_prereq EXECKEEPSPID
|
2009-03-11 20:17:26 +00:00
|
|
|
;;
|
|
|
|
esac
|
2009-03-04 21:38:24 +00:00
|
|
|
|
2009-04-03 19:33:59 +00:00
|
|
|
test -z "$NO_PERL" && test_set_prereq PERL
|
|
|
|
|
2009-03-04 21:38:24 +00:00
|
|
|
# test whether the filesystem supports symbolic links
|
|
|
|
ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
|
|
|
|
rm -f y
|