From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Thu, 23 Apr 2020 21:26:43 +0000 (+0300)
Subject: test/test-lib.sh: fix two out of tree test issues
X-Git-Tag: archive/debian/0.30_rc0-1~11
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=c9e55a712e1ab4d5e84ba15d07d094865e72ffa1;hp=291ef68eded5ff8f5f39b1aa17a83dd8e6abb342

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

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.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 58972339..87fa6fe4 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 -B "$NOTMUCH_SRCDIR"/test/json_check_nodes.py "$@")
 		if [ "$?" = 0 ]
 		then
 			test_ok_
@@ -1021,7 +1021,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