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.
-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
# Convenience
#
# A regexp to match 5 and 40 hexdigits
test_skip () {
test_count=$(($test_count+1))
to_skip=
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)
do
case $this_test.$test_count in
$skp)
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
mkdir -p "$GIT_VALGRIND"/bin
make_valgrind_symlink $TEST_DIRECTORY/../notmuch
GIT_VALGRIND=$TEST_DIRECTORY/valgrind
mkdir -p "$GIT_VALGRIND"/bin
make_valgrind_symlink $TEST_DIRECTORY/../notmuch
this_test=${0##*/}
this_test=${this_test%%-*}
this_test=${0##*/}
this_test=${this_test%%-*}
-for skp in $GIT_SKIP_TESTS
+for skp in $NOTMUCH_SKIP_TESTS
- for skp in $GIT_SKIP_TESTS
+ for skp in $NOTMUCH_SKIP_TESTS
do
case "$this_test" in
$skp)
do
case "$this_test" in
$skp)