From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mOfOBiUIol69CQAA0tVLHw (envelope-from ) for ; Thu, 23 Apr 2020 21:27:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ECurFCsIol5SAwAA1q6Kng (envelope-from ) for ; Thu, 23 Apr 2020 21:27:07 +0000 Received: from arlo.cworth.org (arlo.cworth.org [50.126.95.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4542D942DEE for ; Thu, 23 Apr 2020 21:27:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id CB76E6DE136D; Thu, 23 Apr 2020 14:27:01 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jzlEKZCnd2Nd; Thu, 23 Apr 2020 14:27:00 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id 107EF6DE10D9; Thu, 23 Apr 2020 14:26:57 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id BCBD36DE10D9 for ; Thu, 23 Apr 2020 14:26:55 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G7yRdEW3KVlj for ; Thu, 23 Apr 2020 14:26:52 -0700 (PDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [212.16.98.55]) by arlo.cworth.org (Postfix) with ESMTPS id C0D856DE10B3 for ; Thu, 23 Apr 2020 14:26:50 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 2C6491B00421; Fri, 24 Apr 2020 00:26:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1587677206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=tfGxJZ1dmSWwdx1RcB67rnfz34boYROK41pQuCeaSqM=; b=o+7RvRnrvSYKQZ7qGbHfN6m5/fP4DnXwkW1ol/4Y+wGJ+QINwr5Y3jYo9Na4MNPAE5krtv gdzZyCXT9+rMuF33xjskY18u0w+rFSI/JmcMcpiHKPiy2arX1n0vAqokVEITBxd03BOmp1 WKla3pA9rlX7IJMW6SRmOOmFa0FVGnYj4bR/wyVVS7Gw1VEPC7eDuX1xQS065zV91N7sA/ IxXcMG9ldkf/1xcO0zd9woFPvzHOVyPZlklidNt5Jw/QbspxlKw8rOJnV9XVGkYJsa66xq LEN6ZS/y9VeJQhD/Bgd5zgzSQIMXMoNXzIpIXV2g/M7r3MXLYRJL7KMsBoF0Jg== From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH] test/test-lib.sh: fix two out of tree test issues Date: Fri, 24 Apr 2020 00:26:43 +0300 Message-Id: <20200423212643.864-1-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.13.3 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1587677206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=tfGxJZ1dmSWwdx1RcB67rnfz34boYROK41pQuCeaSqM=; b=QiAbuWrAKDZv+66u8dmonn6sVT9SRBx9G/UpU+MnhnAUqAG75eriNSUbaCE7oxaMCQPGOR OIFq+NT9aPpwkCVmti+Cy+761voRc5v9Gu1pmyj6Tg6zOJS1Dw0Kr/e07xslwf1KsLBal2 k619V3dV6NNilpt4YXOvH+UsPL7sY5r6EmI/+DA+qDDAocLepLZVlZHKSMmtDcMk5AqCyd hgrnzghCN4yMccSMJfWGdY8lzh1ePaKJBdWAmWfdpbC8xpqTI5OdfqB79bjoVmbp3RHm5X noZ43hY/N9eD9Ps6ZAhbCIadZQMq1Fu2qebY85WcMyVy9yA9jMWLAZ7sGb8VmQ== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1587677206; a=rsa-sha256; cv=none; b=TP1yxRM3df/SwtqQWEa6tjgoK5e6bq6i9UhZORuL5t/u44SssaFRIPZrgOuX0+1wS92azr XQqLwiM+z62A7lSXiqy5zxpnZHcbhg9bZ47q8r+VB5XLkPtdhXAxImudB2ox7J97mnMcy3 kU/k/HABuk1Nu8RlL9GzGO5E5pBkRQoqeZ/IkAJlqg3C0wi5AnH1qSIZ1lrBdqkhzhDsu8 61zFGYK3vzHZDhzLMNLmWzuMDJWQTSOugRtdrvdjIqPRr+lM1T1rDiNwHMmgay/GU0Zrsz 7rNyZ6bzlASS+3WZvrUTcc8zytkv3Q78DaUQ3Dq8SgsLf5JGAQg8c+tdyBBlMw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tomi.ollila@iki.fi MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: notmuch-bounces@notmuchmail.org Sender: "notmuch" X-Scanner: scn0 X-Spam-Score: 2.79 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=iki.fi header.s=lahtoruutu header.b=o+7RvRnr; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 50.126.95.6 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Scan-Result: default: False [2.79 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.46064326856796]; IP_REPUTATION_HAM(0.00)[asn: 27017(-0.18), country: US(-0.00), ip: 50.126.95.6(-0.46)]; R_DKIM_REJECT(1.00)[iki.fi:s=lahtoruutu]; TO_DN_NONE(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; ARC_REJECT(2.00)[signature check failed: fail, {[1] = sig:iki.fi:reject}]; DKIM_TRACE(0.00)[iki.fi:-]; MX_GOOD(-0.50)[cached: notmuchmail.org]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_MED(-0.20)[50.126.95.6:from]; MAILLIST(-0.20)[mailman]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:27017, ipnet:50.126.64.0/18, country:US]; FROM_NEQ_ENVFROM(0.00)[tomi.ollila@iki.fi,notmuch-bounces@notmuchmail.org]; URIBL_BLOCKED(0.00)[json_check_nodes.py:url,run_emacs.sh:url,notmuchmail.org:email]; FROM_HAS_DN(0.00)[]; SPF_REPUTATION_HAM(0.00)[-0.447585935911]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[notmuch@notmuchmail.org]; DMARC_NA(0.00)[iki.fi]; HAS_LIST_UNSUB(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_SEVEN(0.00)[8]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: VFL+zFc2jP5G 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