unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH 1/2] test: check openssl prequisite for add_gpgsm_home
@ 2021-06-08 23:27 David Bremner
  2021-06-08 23:27 ` [PATCH 2/2] emacs: require seq for seq-some David Bremner
  0 siblings, 1 reply; 4+ messages in thread
From: David Bremner @ 2021-06-08 23:27 UTC (permalink / raw)
  To: notmuch; +Cc: David Bremner

This is a fix for the test failures reported by Dan Čermák [1].

It is more robust to check for the prerequisite inside the function
that uses it, rather than in every test file that calls the function.

[1]: id:87k0n4fqgm.fsf@tethera.net
---
 test/test-lib.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 4c9f2a21..862c6bc9 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -136,6 +136,8 @@ add_gnupg_home ()
 
 add_gpgsm_home ()
 {
+    test_require_external_prereq openssl
+
     local fpr
     [ -e "$GNUPGHOME/gpgsm.conf" ] && return
     _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
-- 
2.30.2\r

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] emacs: require seq for seq-some
  2021-06-08 23:27 [PATCH 1/2] test: check openssl prequisite for add_gpgsm_home David Bremner
@ 2021-06-08 23:27 ` David Bremner
  2021-06-08 23:42   ` David Bremner
  0 siblings, 1 reply; 4+ messages in thread
From: David Bremner @ 2021-06-08 23:27 UTC (permalink / raw)
  To: notmuch; +Cc: David Bremner

Although the function dates from 2015, the autoload is newer. In
particular [1] it is not found in Emacs 25.3.

[1]: id:874ke85tqx.fsf@cgc-instruments.com
---
 emacs/notmuch-maildir-fcc.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index ae8f5140..c715532b 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -21,6 +21,8 @@
 
 ;;; Code:
 
+(require 'seq)
+
 (require 'message)
 
 (require 'notmuch-lib)
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] emacs: require seq for seq-some
  2021-06-08 23:27 ` [PATCH 2/2] emacs: require seq for seq-some David Bremner
@ 2021-06-08 23:42   ` David Bremner
  2021-06-20 20:20     ` David Bremner
  0 siblings, 1 reply; 4+ messages in thread
From: David Bremner @ 2021-06-08 23:42 UTC (permalink / raw)
  To: notmuch; +Cc: Dan Čermák

David Bremner <david@tethera.net> writes:

> Although the function dates from 2015, the autoload is newer. In
> particular [1] it is not found in Emacs 25.3.
>
> [1]: id:874ke85tqx.fsf@cgc-instruments.com
> ---
>  emacs/notmuch-maildir-fcc.el | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
> index ae8f5140..c715532b 100644
> --- a/emacs/notmuch-maildir-fcc.el
> +++ b/emacs/notmuch-maildir-fcc.el
> @@ -21,6 +21,8 @@
>  
>  ;;; Code:
>  
> +(require 'seq)
> +
>  (require 'message)
>  
>  (require 'notmuch-lib)
> -- 
> 2.30.2

Dan, can you check if this patch fixes the emacs tests for you?

d

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] emacs: require seq for seq-some
  2021-06-08 23:42   ` David Bremner
@ 2021-06-20 20:20     ` David Bremner
  0 siblings, 0 replies; 4+ messages in thread
From: David Bremner @ 2021-06-20 20:20 UTC (permalink / raw)
  To: notmuch; +Cc: Dan Čermák


I have applied these two patches to release and master.

d

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-06-20 20:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 23:27 [PATCH 1/2] test: check openssl prequisite for add_gpgsm_home David Bremner
2021-06-08 23:27 ` [PATCH 2/2] emacs: require seq for seq-some David Bremner
2021-06-08 23:42   ` David Bremner
2021-06-20 20:20     ` David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).