diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2021-05-15 15:47:41 -0500 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-05-17 07:28:23 -0300 |
| commit | cd9ec20a49b731276ed5f0838b4f0782c281e239 (patch) | |
| tree | c02e95b744a4405676cd30221094bf5ba7ea995d /test | |
| parent | 4561f694e94aff47e7065186c4efaf2c6b010a41 (diff) | |
test: emacs: simplify missing dependencies check
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-lib.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index c1395c87..e1a597f7 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -115,9 +115,11 @@ unset EMAIL unset NAME test_require_emacs () { - test_require_external_prereq emacs - test_require_external_prereq ${TEST_EMACSCLIENT} - test_require_external_prereq dtach + local ret=0 + test_require_external_prereq emacs || ret=1 + test_require_external_prereq ${TEST_EMACSCLIENT} || ret=1 + test_require_external_prereq dtach || ret=1 + return $ret } add_gnupg_home () { @@ -1048,11 +1050,7 @@ EOF test_emacs () { # test dependencies beforehand to avoid the waiting loop below - missing_dependencies= - 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 + test_require_emacs || return if [ -z "$EMACS_SERVER" ]; then emacs_tests="$NOTMUCH_SRCDIR/test/${this_test_bare}.el" |