From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 353B56DE0AF4 for ; Sat, 21 Oct 2017 12:21:50 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.019 X-Spam-Level: X-Spam-Status: No, score=0.019 tagged_above=-999 required=5 tests=[AWL=0.039, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled 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 LXsLEDcJhvop for ; Sat, 21 Oct 2017 12:21:49 -0700 (PDT) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by arlo.cworth.org (Postfix) with ESMTPS id E80FC6DE0ACB for ; Sat, 21 Oct 2017 12:21:48 -0700 (PDT) Received: by mail-lf0-f51.google.com with SMTP id a69so16285973lfe.5 for ; Sat, 21 Oct 2017 12:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=fr292Sq4uSLNNUljSe4UFHVAaE3CWnrLt7ar8AlTVqM=; b=15SmHF+HtHhBTBmH3KdLx6SMELcEyxW0wJOk2qdHXUaKvAkPaoOZjknuIx0mky3NMP HxagVyKJGHMsWfgn4E8EBmCEk3x897PTRUMl2aoaosUDOZJQBbr5h8ykBSCsILbmHeYs Nm+aENqX8gJNcHAj//3MpfFBJSmOTO81c0qeJR66B4+GRGQFej1tXf/fkE6OhxJf/qQi kwB4s2kamW5qQ6IpbedZhBsVLOI9ZX9x1SBYPvbyur+/n+urXU7l46J6Q/XH8Pb8LSkF DeU0hX4HjM5eHjtQTMjg/rOzdDa0G3nl0RQM/ofxXFeXSkioZkhacruJlaqhhCGaYx2P jBNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fr292Sq4uSLNNUljSe4UFHVAaE3CWnrLt7ar8AlTVqM=; b=cVlscsZB9Nn6Qh7Xe3hd0ZrTCU+oDGLn4W3xWu8V9RrNbBGMDJ+637YkepSIsIvb2x KOToPFv9xouqmYfdO13HiFpU+geANModlkp5PCoeJQyefmyXEAk/UGVEzCGIbmBlxR89 pAWpa7GQZ6ajFsFxsAqFtIcSGavE3b4QoPfMUnYsiLHhe9RTrEdn5I+YWopK2wyrW8Yy RP3D12ckP2+I2Vlm9oDgg1VD2yzORMmcVy63RVzJuw8Edqv2k0nz3bZo+E/FF/MKvAQJ pdsLx59w5IVUn8rnWOF+1dOiORlAnzz4ih9UXE5qsqtp+oHKSUKCMZNe2+Rs1pWu/7zT 6TrQ== X-Gm-Message-State: AMCzsaXsV0JSDdHYmMVn7P7Wm9mfsI7eSJN4ga3HOcypUoIU7VifVonS 2glCq5SoOEBCV8KaMrkySl7J3g== X-Google-Smtp-Source: ABhQp+RIqA+SWY1bM7Kh9NnXOzqLF98mGwj+CiRnYiMQ+w9Qd6TMnJPZol4KN5NW8yQLAnJKzRORfw== X-Received: by 10.46.78.1 with SMTP id c1mr3467015ljb.90.1508613706540; Sat, 21 Oct 2017 12:21:46 -0700 (PDT) Received: from localhost (mobile-access-5d6a0c-19.dhcp.inet.fi. [93.106.12.19]) by smtp.gmail.com with ESMTPSA id 77sm856872ljj.12.2017.10.21.12.21.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2017 12:21:45 -0700 (PDT) From: Jani Nikula To: David Bremner , Jani Nikula , notmuch@notmuchmail.org Subject: [PATCH v2] test: use source path in add_gnupg_home Date: Sat, 21 Oct 2017 22:21:41 +0300 Message-Id: <20171021192141.6666-1-jani@nikula.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <87mv4k8ry7.fsf@tethera.net> References: <87mv4k8ry7.fsf@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Oct 2017 19:21:50 -0000 Make a distinction between source and build directories. --- v2 rebase, add_gnupg_home is now in test-lib.sh --- 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 7926d2787710..5274e6e1cf2c 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -109,7 +109,7 @@ add_gnupg_home () _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } at_exit_function _gnupg_exit mkdir -m 0700 "$GNUPGHOME" - gpg --no-tty --import <$TEST_DIRECTORY/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1 + gpg --no-tty --import <$NOTMUCH_SRCDIR/test/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1 test_debug "cat $GNUPGHOME/import.log" if (gpg --quick-random --version >/dev/null 2>&1) ; then echo quick-random >> "$GNUPGHOME"/gpg.conf -- 2.11.0