unofficial mirror of notmuch@notmuchmail.org
 help / color / Atom feed
* [PATCH] tests: fix test_json_nodes() in out-of-tree builds
@ 2020-05-22  1:16 Daniel Kahn Gillmor
  2020-05-24 17:59 ` Tomi Ollila
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Kahn Gillmor @ 2020-05-22  1:16 UTC (permalink / raw)
  To: Notmuch Mail

In out-of-tree builds, $TEST_DIRECTORY doesn't contain
json_check_nodes.py.  This caused 27 tests to fail in such an
environment.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
 test/test-lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 58972339..792b1cb9 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -556,7 +556,7 @@ test_json_nodes () {
 
 	if ! test_skip "$test_subtest_name"
 	then
-	    output=$(PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON "$TEST_DIRECTORY"/json_check_nodes.py "$@")
+	    output=$(PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON "$NOTMUCH_SRCDIR"/test/json_check_nodes.py "$@")
 		if [ "$?" = 0 ]
 		then
 			test_ok_
-- 
2.26.2

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

* Re: [PATCH] tests: fix test_json_nodes() in out-of-tree builds
  2020-05-22  1:16 [PATCH] tests: fix test_json_nodes() in out-of-tree builds Daniel Kahn Gillmor
@ 2020-05-24 17:59 ` Tomi Ollila
  2020-05-26 14:36   ` Daniel Kahn Gillmor
  0 siblings, 1 reply; 3+ messages in thread
From: Tomi Ollila @ 2020-05-24 17:59 UTC (permalink / raw)
  To: Daniel Kahn Gillmor, Notmuch Mail

On Thu, May 21 2020, Daniel Kahn Gillmor wrote:

> In out-of-tree builds, $TEST_DIRECTORY doesn't contain
> json_check_nodes.py.  This caused 27 tests to fail in such an
> environment.

are you shure the run_emacs.sh change in 

id:"20200423212643.864-1-tomi.ollila@iki.fi"

is not needed ? =D

Tomi

>
> Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
> ---
>  test/test-lib.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 58972339..792b1cb9 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -556,7 +556,7 @@ test_json_nodes () {
>  
>  	if ! test_skip "$test_subtest_name"
>  	then
> -	    output=$(PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON "$TEST_DIRECTORY"/json_check_nodes.py "$@")
> +	    output=$(PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON "$NOTMUCH_SRCDIR"/test/json_check_nodes.py "$@")
>  		if [ "$?" = 0 ]
>  		then
>  			test_ok_
> -- 
> 2.26.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

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

* Re: [PATCH] tests: fix test_json_nodes() in out-of-tree builds
  2020-05-24 17:59 ` Tomi Ollila
@ 2020-05-26 14:36   ` Daniel Kahn Gillmor
  0 siblings, 0 replies; 3+ messages in thread
From: Daniel Kahn Gillmor @ 2020-05-26 14:36 UTC (permalink / raw)
  To: Tomi Ollila, Notmuch Mail


[-- Attachment #1.1: Type: text/plain, Size: 799 bytes --]

On Sun 2020-05-24 20:59:29 +0300, Tomi Ollila wrote:
> On Thu, May 21 2020, Daniel Kahn Gillmor wrote:
>
>> In out-of-tree builds, $TEST_DIRECTORY doesn't contain
>> json_check_nodes.py.  This caused 27 tests to fail in such an
>> environment.
>
> are you shure the run_emacs.sh change in 
>
> id:"20200423212643.864-1-tomi.ollila@iki.fi"
>
> is not needed ? =D

Sorry, i'd missed that message entirely.  Looks like we were barking up
the same tree :)

I do not mean to cast doubt on the run_emacs.sh change -- i haven't seen
the particular failure with two different versions of emacs, so i don't
know that i can comment on it.

At any rate, these seem like two distinct fixes.  I'd be happy to see
them both applied, so maybe just drop my patch and merge Tomi's?

   --dkg

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



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

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22  1:16 [PATCH] tests: fix test_json_nodes() in out-of-tree builds Daniel Kahn Gillmor
2020-05-24 17:59 ` Tomi Ollila
2020-05-26 14:36   ` Daniel Kahn Gillmor

unofficial mirror of notmuch@notmuchmail.org

Archives are clonable:
	git clone --mirror https://yhetil.org/notmuch/0 notmuch/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 notmuch notmuch/ https://yhetil.org/notmuch \
		notmuch@notmuchmail.org
	public-inbox-index notmuch

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.mail.notmuch.general
	nntp://news.gmane.io/gmane.mail.notmuch.general


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git