debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: leave T\d\d\d- in variable $this_test and introduce $this_test_bare

Browse source 
Script `notmuch-test` expects the results file have T\d\d\d- part
intact so the results files (and some test output files) are now
name as such.
Without this change `notmuch-test` will exit in case the test
script it was executing exited with nonzero value.

The T\d\d\d- part is dropped in new variable $this_test_bare which is
used in progress informational messages and when loading .el files in
emacs tests (whenever $this_test_bare.el exists).
This commit is contained in:
Tomi Ollila 2014-01-15 21:02:03 +02:00 committed by David Bremner
parent f94834407b
commit 86e24eab8a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test-lib.sh
View file

@ -27,7 +27,7 @@ shopt -u xpg_echo
this_test=${0##*/} this_test=${0##*/}
this_test=${this_test%.sh} this_test=${this_test%.sh}
this_test=${this_test#T[0-9][0-9][0-9]-} this_test_bare=${this_test#T[0-9][0-9][0-9]-}
# 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.
@ -196,7 +196,7 @@ print_test_description ()
{ {
test -z "$test_description_printed" || return 0 test -z "$test_description_printed" || return 0
echo echo
echo $this_test: "Testing ${test_description}" echo $this_test_bare: "Testing ${test_description}"
test_description_printed=1 test_description_printed=1
} }
if [ -z "$NOTMUCH_TEST_QUIET" ] if [ -z "$NOTMUCH_TEST_QUIET" ]
@ -1085,7 +1085,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="${this_test}.el" emacs_tests="${this_test_bare}.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