mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 17:34:54 +01:00
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.
This commit is contained in:
parent
291ef68ede
commit
c9e55a712e
1 changed files with 2 additions and 2 deletions
|
@ -556,7 +556,7 @@ test_json_nodes () {
|
||||||
|
|
||||||
if ! test_skip "$test_subtest_name"
|
if ! test_skip "$test_subtest_name"
|
||||||
then
|
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 ]
|
if [ "$?" = 0 ]
|
||||||
then
|
then
|
||||||
test_ok_
|
test_ok_
|
||||||
|
@ -1021,7 +1021,7 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
|
||||||
# --load Force loading of notmuch.el and test-lib.el
|
# --load Force loading of notmuch.el and test-lib.el
|
||||||
|
|
||||||
exec ${TEST_EMACS} --quick \
|
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 \
|
--directory "$NOTMUCH_SRCDIR/test" --load test-lib.el \
|
||||||
"\$@"
|
"\$@"
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in a new issue