debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: emacs: simplify missing dependencies check

Browse source 
No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras 2021-05-15 15:47:41 -05:00 committed by David Bremner
parent 4561f694e9
commit cd9ec20a49
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/test-lib.sh
View file

@ -115,9 +115,11 @@ unset EMAIL
unset NAME unset NAME
test_require_emacs () { test_require_emacs () {
test_require_external_prereq emacs local ret=0
test_require_external_prereq ${TEST_EMACSCLIENT} test_require_external_prereq emacs || ret=1
test_require_external_prereq dtach test_require_external_prereq ${TEST_EMACSCLIENT} || ret=1
test_require_external_prereq dtach || ret=1
return $ret
} }
add_gnupg_home () { add_gnupg_home () {
@ -1048,11 +1050,7 @@ EOF
test_emacs () { test_emacs () {
# test dependencies beforehand to avoid the waiting loop below # test dependencies beforehand to avoid the waiting loop below
missing_dependencies= test_require_emacs || return
test_require_external_prereq dtach || missing_dependencies=1
test_require_external_prereq emacs || missing_dependencies=1
test_require_external_prereq ${TEST_EMACSCLIENT} || missing_dependencies=1
test -z "$missing_dependencies" || return
if [ -z "$EMACS_SERVER" ]; then if [ -z "$EMACS_SERVER" ]; then
emacs_tests="$NOTMUCH_SRCDIR/test/${this_test_bare}.el" emacs_tests="$NOTMUCH_SRCDIR/test/${this_test_bare}.el"