From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eLqOL/Inx16EOwAA0tVLHw (envelope-from ) for ; Fri, 22 May 2020 01:16:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QFBYK/Inx14MZAAAB5/wlQ (envelope-from ) for ; Fri, 22 May 2020 01:16:34 +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 61B209402D1 for ; Fri, 22 May 2020 01:16:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 4A3676DE0F4F; Thu, 21 May 2020 18:16:29 -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 z_yyx_44Pidv; Thu, 21 May 2020 18:16:28 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id 0D0936DE0F54; Thu, 21 May 2020 18:16:28 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 9EB796DE0F54 for ; Thu, 21 May 2020 18:16:26 -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 7pWV_eGnS2HA for ; Thu, 21 May 2020 18:16:25 -0700 (PDT) Received: from che.mayfirst.org (unknown [162.247.75.117]) by arlo.cworth.org (Postfix) with ESMTPS id A55586DE0F4F for ; Thu, 21 May 2020 18:16:25 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1590110185; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=ScC6/ZfukUqSUfwgGLDm1yfszS0vVpJSxVLAxyGLR/k=; b=pPguSF+V5gHk21NZwaRzs23ma3Kmxtec+htAFnvDxwd03xCsvvujVG/VUovjYpTGHgKVk miVqexeERjPvfLSAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1590110185; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=ScC6/ZfukUqSUfwgGLDm1yfszS0vVpJSxVLAxyGLR/k=; b=hosiWPJAWmWaNrOAsxfGxNWCSxci0ze4Xguk+hvm7iFJaiSd9AuRe2HAwWzLIc2pn77uE TuYKZGkeLLvfBfIFZ2/gmY4QcF0/Q2q83WSuz0+dvyWQB4ja/gW2EgZQ75yFpjcrIueqK1Q BGVt9LU07CUVWJAvhFkZexDBi6zh0rZ9twJIsmPrbmDp4TONBCnzrEEhTh4lMu6A7oVksrx yuGKS4CrpLfTci2QHzrGHoaX+nKJZwN8S4liA9m0rp91ONiQUB5Y/664pZEUapEaU6Wr8nB W7Hs8ggZN0dttP+kovux6PRCJW6vtL+Se2rat5lBxpLar/fPffPwbn7xn/ZQ== Received: from fifthhorseman.net (unknown [IPv6:2001:470:1f07:60d:f2de:f1ff:fec3:d109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id EAEFCF9A5 for ; Thu, 21 May 2020 21:16:24 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id A0098202CB; Thu, 21 May 2020 21:16:21 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH] tests: fix test_json_nodes() in out-of-tree builds Date: Thu, 21 May 2020 21:16:21 -0400 Message-Id: <20200522011621.768746-1-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: notmuch-bounces@notmuchmail.org Sender: "notmuch" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=fifthhorseman.net header.s=2019 header.b=pPguSF+V; dkim=fail (body hash did not verify) header.d=fifthhorseman.net header.s=2019rsa header.b=hosiWPJA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fifthhorseman.net (policy=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-Spam-Score: 1.09 X-TUID: FT3d3oF8SrdV 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