unset GREP_OPTIONS
-case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
- 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
-
# Convenience
#
# A regexp to match 5 and 40 hexdigits
*) test -n "$quiet" && return;;
esac
shift
- printf "* %s" "$*"
+ printf " "
+ printf "$@"
tput sgr0
- echo
)
}
else
say_color() {
test -z "$1" && test -n "$quiet" && return
shift
- echo "* $*"
+ printf " "
+ printf "$@"
}
fi
if test "$help" = "t"
then
- echo "$test_description"
+ echo "Tests ${test_description}"
exit 0
fi
+echo "Testing ${test_description}"
+
exec 5>&1
if test "$verbose" = "t"
then
fi
if [ -z "${template[date]}" ]; then
- template[date]="Tue, 05 Jan 2001 15:43:57 -0800"
+ template[date]="Tue, 05 Jan 2001 15:43:57 -0000"
fi
additional_headers=""
notmuch new > /dev/null
}
-pass_if_equal ()
+test_begin_subtest ()
{
- output=$1
- expected=$2
+ test_subtest_name="$1"
+}
- if [ "$output" = "$expected" ]; then
- true
- else
- testname=$this_test.$test_count
- echo "$expected" > $testname.expected
- echo "$output" > $testname.output
- diff -u $testname.expected $testname.output
- false
+# Pass test if two arguments match
+#
+# Note: Unlike all other test_expect_* functions, this function does
+# not accept a test name. Instead, the caller should call
+# test_begin_subtest before calling this function in order to set the
+# name.
+test_expect_equal ()
+{
+ test "$#" = 3 && { prereq=$1; shift; } || prereq=
+ test "$#" = 2 ||
+ error "bug in the test script: not 2 or 3 parameters to test_expect_equal"
+
+ output="$1"
+ expected="$2"
+ if ! test_skip "$@"
+ then
+ if [ "$output" = "$expected" ]; then
+ test_ok_ "$test_subtest_name"
+ else
+ testname=$this_test.$test_count
+ echo "$expected" > $testname.expected
+ echo "$output" > $testname.output
+ test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)"
+ fi
fi
}
test_ok_ () {
test_success=$(($test_success + 1))
- say_color "" " ok $test_count: $@"
+ say_color pass "%-6s" "PASS"
+ echo " $@"
}
test_failure_ () {
test_failure=$(($test_failure + 1))
- say_color error "FAIL $test_count: $1"
+ say_color error "%-6s" "FAIL"
+ echo " $1"
shift
echo "$@" | sed -e 's/^/ /'
test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
test_known_broken_ok_ () {
test_fixed=$(($test_fixed+1))
- say_color "" " FIXED $test_count: $@"
+ say_color pass "%-6s" "FIXED"
+ echo " $@"
}
test_known_broken_failure_ () {
test_broken=$(($test_broken+1))
- say_color skip " still broken $test_count: $@"
+ say_color pass "%-6s" "BROKEN"
+ echo " $@"
}
test_debug () {
test_skip () {
test_count=$(($test_count+1))
to_skip=
- for skp in $GIT_SKIP_TESTS
+ for skp in $NOTMUCH_SKIP_TESTS
do
case $this_test.$test_count in
$skp)
case "$to_skip" in
t)
say_color skip >&3 "skipping test: $@"
- say_color skip "skip $test_count: $1"
+ say_color skip "%-6s" "SKIP"
+ echo " $1"
: true
;;
*)
error "bug in the test script: not 2 or 3 parameters to test-expect-failure"
if ! test_skip "$@"
then
- say >&3 "checking known breakage: $2"
test_run_ "$2"
if [ "$?" = 0 -a "$eval_ret" = 0 ]
then
test_known_broken_failure_ "$1"
fi
fi
- echo >&3 ""
}
test_expect_success () {
error "bug in the test script: not 2 or 3 parameters to test-expect-success"
if ! test_skip "$@"
then
- say >&3 "expecting success: $2"
test_run_ "$2"
if [ "$?" = 0 -a "$eval_ret" = 0 ]
then
test_failure_ "$@"
fi
fi
- echo >&3 ""
}
test_expect_code () {
error "bug in the test script: not 3 or 4 parameters to test-expect-code"
if ! test_skip "$@"
then
- say >&3 "expecting exit code $1: $3"
test_run_ "$3"
if [ "$?" = 0 -a "$eval_ret" = "$1" ]
then
test_failure_ "$@"
fi
fi
- echo >&3 ""
}
# test_external runs external test scripts that provide continuous
[ -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"
echo "failed $test_failure" >> $test_results_path
echo "" >> $test_results_path
- 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)"
- msg="remaining $(($test_count-$test_broken)) test(s)"
+ echo
+
+ if [ "$test_failure" = "0" ]; then
+ rm -rf "$remove_tmp"
+ exit 0
else
- msg="$test_count test(s)"
+ exit 1
fi
- case "$test_failure" in
- 0)
- say_color pass "passed all $msg"
-
- test -d "$remove_trash" &&
- cd "$(dirname "$remove_trash")" &&
- rm -rf "$(basename "$remove_trash")"
-
- exit 0 ;;
-
- *)
- say_color error "failed $test_failure among $msg"
- exit 1 ;;
-
- esac
}
find_notmuch_path ()
# Test the binaries we have just built. The tests are kept in
# test/ subdirectory and are run in 'trash directory' subdirectory.
TEST_DIRECTORY=$(pwd)
-# FIXME: Only the normal case bellow is updated to notmuch
if test -n "$valgrind"
then
make_symlink () {
make_symlink "$symlink_target" "$GIT_VALGRIND/bin/$base" || exit
}
- # override all git executables in TEST_DIRECTORY/..
+ # override notmuch executable 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
+ make_valgrind_symlink $TEST_DIRECTORY/../notmuch
OLDIFS=$IFS
IFS=:
for path in $PATH
do
- ls "$path"/git-* 2> /dev/null |
+ ls "$path"/notmuch 2> /dev/null |
while read file
do
make_valgrind_symlink "$file"
PATH=$GIT_VALGRIND/bin:$PATH
GIT_EXEC_PATH=$GIT_VALGRIND/bin
export GIT_VALGRIND
-elif test -n "$GIT_TEST_INSTALLED" ; then
- 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}
else # normal case
notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
test -n "$notmuch_path" && PATH="$notmuch_path:$PATH"
export PATH
# Test repository
-test="trash directory.$(basename "$0" .sh)"
+test="tmp.$(basename "$0" .sh)"
test -n "$root" && test="$root/$test"
case "$test" in
-/*) TRASH_DIRECTORY="$test" ;;
- *) TRASH_DIRECTORY="$TEST_DIRECTORY/$test" ;;
+/*) TMP_DIRECTORY="$test" ;;
+ *) TMP_DIRECTORY="$TEST_DIRECTORY/$test" ;;
esac
-test ! -z "$debug" || remove_trash=$TRASH_DIRECTORY
+test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY
rm -fr "$test" || {
GIT_EXIT_OK=t
echo >&5 "FATAL: Cannot prepare test area"
exit 1
}
-MAIL_DIR="${TRASH_DIRECTORY}/mail"
-export NOTMUCH_CONFIG="${TRASH_DIRECTORY}/notmuch-config"
+MAIL_DIR="${TMP_DIRECTORY}/mail"
+export NOTMUCH_CONFIG="${TMP_DIRECTORY}/notmuch-config"
mkdir -p "${test}"
mkdir "$MAIL_DIR"
this_test=${0##*/}
this_test=${this_test%%-*}
-for skp in $GIT_SKIP_TESTS
+for skp in $NOTMUCH_SKIP_TESTS
do
to_skip=
- for skp in $GIT_SKIP_TESTS
+ for skp in $NOTMUCH_SKIP_TESTS
do
case "$this_test" in
$skp)
projects / notmuch / blobdiff