debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-09 18:21:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: resolve basename "$0" .sh once for all in test-lib.sh

Browse source 
test-lib.sh sometimes did equivalent of `basename "$0" .sh`, sometimes
skipping the basename part and sometimes .sh part. This worked as
we never had path components in $0 (more than ./) nor .sh ending.

Now the equivalent of `basename "$0" .sh` is done once and used
everywhere. In the future we may have .sh suffix in test names
-- removing those is a good idea.
This commit is contained in:
Tomi Ollila 2013-11-25 19:08:17 +02:00 committed by David Bremner
parent bb390f89a1
commit 5985438e05
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/test-lib.sh
View file

@ -25,6 +25,9 @@ fi
# Make sure echo builtin does not expand backslash-escape sequences by default. # Make sure echo builtin does not expand backslash-escape sequences by default.
shopt -u xpg_echo shopt -u xpg_echo
this_test=${0##*/}
this_test=${this_test%.sh}
# if --tee was passed, write the output not only to the terminal, but # if --tee was passed, write the output not only to the terminal, but
# additionally to the file test-results/$BASENAME.out, too. # additionally to the file test-results/$BASENAME.out, too.
case "$GIT_TEST_TEE_STARTED, $* " in case "$GIT_TEST_TEE_STARTED, $* " in
@ -33,7 +36,7 @@ done,*)
;; ;;
*' --tee '*|*' --va'*) *' --tee '*|*' --va'*)
mkdir -p test-results mkdir -p test-results
BASE=test-results/$(basename "$0" .sh) BASE=test-results/$this_test
(GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1; (GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
echo $? > $BASE.exit) | tee $BASE.out echo $? > $BASE.exit) | tee $BASE.out
test "$(cat $BASE.exit)" = 0 test "$(cat $BASE.exit)" = 0
@ -187,7 +190,7 @@ then
exit 0 exit 0
fi fi
echo $(basename "$0"): "Testing ${test_description}" echo $this_test: "Testing ${test_description}"
exec 5>&1 exec 5>&1
@ -967,7 +970,7 @@ test_done () {
GIT_EXIT_OK=t GIT_EXIT_OK=t
test_results_dir="$TEST_DIRECTORY/test-results" test_results_dir="$TEST_DIRECTORY/test-results"
mkdir -p "$test_results_dir" mkdir -p "$test_results_dir"
test_results_path="$test_results_dir/${0%.sh}" test_results_path="$test_results_dir/$this_test"
echo "total $test_count" >> $test_results_path echo "total $test_count" >> $test_results_path
echo "success $test_success" >> $test_results_path echo "success $test_success" >> $test_results_path
@ -1026,7 +1029,7 @@ test_emacs () {
test -z "$missing_dependencies" || return test -z "$missing_dependencies" || return
if [ -z "$EMACS_SERVER" ]; then if [ -z "$EMACS_SERVER" ]; then
emacs_tests="$(basename $0).el" emacs_tests="${this_test}.el"
if [ -f "$TEST_DIRECTORY/$emacs_tests" ]; then if [ -f "$TEST_DIRECTORY/$emacs_tests" ]; then
load_emacs_tests="--eval '(load \"$emacs_tests\")'" load_emacs_tests="--eval '(load \"$emacs_tests\")'"
else else
@ -1140,7 +1143,6 @@ else
exec 4>test.output 3>&4 exec 4>test.output 3>&4
fi fi
this_test=${0##*/}
for skp in $NOTMUCH_SKIP_TESTS for skp in $NOTMUCH_SKIP_TESTS
do do
to_skip= to_skip=