test: Rename GIT_SKIP_TESTS to NOTMUCH_SKIP_TESTS

By scanning test-lib.sh for occurrences of "git" or "GIT", I found
that most of those are internal things, (like the GIT_TEST_TEE_STARTED
variable). But GIT_SKIP_TESTS is part of the user-interface to the
test suite, so we rename it to reference notmuch rather than git.

Also, the GIT_TRACE warning is git-specific, so we drop that as well.
This commit is contained in:
Carl Worth 2010-09-20 13:54:57 -07:00
parent 8369ed31d0
commit 16a6301ade

View file

@ -49,15 +49,6 @@ unset CDPATH
unset GREP_OPTIONS 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 # Convenience
# #
# A regexp to match 5 and 40 hexdigits # A regexp to match 5 and 40 hexdigits
@ -500,7 +491,7 @@ test_run_ () {
test_skip () { test_skip () {
test_count=$(($test_count+1)) test_count=$(($test_count+1))
to_skip= to_skip=
for skp in $GIT_SKIP_TESTS for skp in $NOTMUCH_SKIP_TESTS
do do
case $this_test.$test_count in case $this_test.$test_count in
$skp) $skp)
@ -782,7 +773,7 @@ then
make_symlink "$symlink_target" "$GIT_VALGRIND/bin/$base" || exit 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 GIT_VALGRIND=$TEST_DIRECTORY/valgrind
mkdir -p "$GIT_VALGRIND"/bin mkdir -p "$GIT_VALGRIND"/bin
make_valgrind_symlink $TEST_DIRECTORY/../notmuch make_valgrind_symlink $TEST_DIRECTORY/../notmuch
@ -843,10 +834,10 @@ cd -P "$test" || error "Cannot setup test environment"
this_test=${0##*/} this_test=${0##*/}
this_test=${this_test%%-*} this_test=${this_test%%-*}
for skp in $GIT_SKIP_TESTS for skp in $NOTMUCH_SKIP_TESTS
do do
to_skip= to_skip=
for skp in $GIT_SKIP_TESTS for skp in $NOTMUCH_SKIP_TESTS
do do
case "$this_test" in case "$this_test" in
$skp) $skp)