Re: [PATCH] tests: fix test_json_nodes() in out-of-tree builds

2020-05-26 Thread Daniel Kahn Gillmor
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.oll...@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


signature.asc
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] tests: fix test_json_nodes() in out-of-tree builds

2020-05-24 Thread Tomi Ollila
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.oll...@iki.fi"

is not needed ? =D

Tomi

>
> Signed-off-by: Daniel Kahn Gillmor 
> ---
>  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
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch


[PATCH] tests: fix test_json_nodes() in out-of-tree builds

2020-05-21 Thread Daniel Kahn Gillmor
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 
---
 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