[PATCH] test/test-lib.sh: fix two out of tree test issues

[PATCH] test/test-lib.sh: fix two out of tree test issues

[Tomi Ollila]

json_check_nodes.py exists in source tree, not in out of tree
build tree. Added -B to the execution so source tree is not
"polluted" by a .pyc file when json_check_nodes.py is executed.

When creating run_emacs.sh make it load .elc files from out of
tree build tree, not from source tree if such files existed.
If existed, those may be outdated, or even created by some other
emacs than the one that was used to build .elc files in out of
tree build dir.
---

Noticed latter when did in-tree build on Fedora 31 host, then
out-of-tree build running Ubuntu 18.04 in (podman) container;
Fedora had Emacs 26, and ubuntu emacs 25 -- got bytecode
errors...

 test/test-lib.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 7f8a3a4d..f9b7d866 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -523,7 +523,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 -B "$NOTMUCH_SRCDIR"/test/json_check_nodes.py "$@")
 		if [ "$?" = 0 ]
 		then
 			test_ok_
@@ -984,7 +984,7 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
 # --load		Force loading of notmuch.el and test-lib.el
 
 exec ${TEST_EMACS} --quick \
-	--directory "$NOTMUCH_SRCDIR/emacs" --load notmuch.el \
+	--directory "$NOTMUCH_BUILDDIR/emacs" --load notmuch.el \
 	--directory "$NOTMUCH_SRCDIR/test" --load test-lib.el \
 	"\$@"
 EOF
-- 
2.25.3

Re: [PATCH] test/test-lib.sh: fix two out of tree test issues

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> json_check_nodes.py exists in source tree, not in out of tree
> build tree. Added -B to the execution so source tree is not
> "polluted" by a .pyc file when json_check_nodes.py is executed.
>

pushed to master