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 9FD8C6DE128B for ; Mon, 25 Sep 2017 13:39:48 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.07 X-Spam-Level: X-Spam-Status: No, score=-0.07 tagged_above=-999 required=5 tests=[AWL=0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.211] 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 UAevGT1n3XJx for ; Mon, 25 Sep 2017 13:39:48 -0700 (PDT) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by arlo.cworth.org (Postfix) with ESMTPS id 67F476DE12DE for ; Mon, 25 Sep 2017 13:39:15 -0700 (PDT) Received: by mail-wr0-f195.google.com with SMTP id b9so601328wra.0 for ; Mon, 25 Sep 2017 13:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=DgdfZpZgRh8Vu+xWxjQxadE70TalaCOKMPj6gulgIIc=; b=Tb3xzm8lnRazBjnRvc4ed8pbbhqwUcAabVpkJeir8xTDAxdB3mp8cwe47rUtpwW3qW Ww3UeJaVyc+d7YRkof3czSGvs3RPBhW1nT9Q6/EwqZ4akeBlrO0LKYctei6VsBQ9lbHg tivvcrdKybGXFlGOfuC01/Am5o8R0ULLnCal0qGs+FnbHFegyD0MJMTWwS2DrtgHK7tn Ac/iRMFB36FypGovQkzVRiI2oQ/uSbZlSl1rMPNJos1DnOhdrNs0mlkmOvwBqcWpZW9v VokYi/vnmZ1UxSZD71Xd3aVYvCeGBVX4huSbyv2B+HhI732Y3P1EyA3AC74lB/9NugOG L+Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=DgdfZpZgRh8Vu+xWxjQxadE70TalaCOKMPj6gulgIIc=; b=kwt1uV6nV1S492P8fpUm4yvcaJ0xColyiPQp9vEri6irDr59jIidxFggNmeD6PjMn2 6k3J7AYpCcXhBZhXSW/F65lNVIz05M9lik6+egDxt/P4dSTpZkLVCWTuN0xyQVwPOQM6 6pRm4cCanfSl1zWYpFKC2OBFGcZI1iWUpbtj7lqYAmjVmmSC9qGB2CZtqfRdI5T/F08w PyRz+1pVzPppuHWNhi+EJQGUUhnPawtBBO2M3RkHnaEN5Nn04eYkJVhkgMPoRjhXa5N+ eHH1G+IqAjeBgeQqC0Nno04jpiYivFW+rKc8w8p0HpfXu+MEd7GqHhHN4XzZLBuwIeXS HVhg== X-Gm-Message-State: AHPjjUgMFEEnEWB1RG1gCE3/kdN8Edmj+6bIqBou7nGpsx+XQgxuAq4N nYQHAIE/UzT7kU8VY4dbZeuvZadZplE= X-Google-Smtp-Source: AOwi7QDvNnMqbNFy3cu3wDYc1CrEIbP1OFv6qCqYr9e5QATCtka/TnhGEgdWII5i6Lcxqj6wRgy8ew== X-Received: by 10.25.67.26 with SMTP id q26mr2529727lfa.84.1506371953049; Mon, 25 Sep 2017 13:39:13 -0700 (PDT) Received: from localhost (mobile-access-5d6a60-234.dhcp.inet.fi. [93.106.96.234]) by smtp.gmail.com with ESMTPSA id t20sm1574558ljb.91.2017.09.25.13.39.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Sep 2017 13:39:12 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 17/24] test: use source and build paths in T355-smime.sh Date: Mon, 25 Sep 2017 23:38:33 +0300 Message-Id: <1c1a475594d0e83440a498a8707035964697a4ea.1506370901.git.jani@nikula.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: 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: Mon, 25 Sep 2017 20:39:48 -0000 Make a distinction between source and build directories. --- test/T355-smime.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/T355-smime.sh b/test/T355-smime.sh index b813b6cad2e5..1523f17b9f6f 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -10,7 +10,7 @@ add_gpgsm_home () _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } at_exit_function _gnupg_exit mkdir -m 0700 "$GNUPGHOME" - gpgsm --no-tty --no-common-certs-import --disable-dirmngr --import < $TEST_DIRECTORY/smime/test.crt >"$GNUPGHOME"/import.log 2>&1 + gpgsm --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/test.crt >"$GNUPGHOME"/import.log 2>&1 fpr=$(gpgsm --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p') echo "$fpr S relax" >> $GNUPGHOME/trustlist.txt test_debug "cat $GNUPGHOME/import.log" @@ -19,7 +19,7 @@ add_gpgsm_home () test_require_external_prereq openssl test_require_external_prereq gpgsm -cp $TEST_DIRECTORY/smime/key+cert.pem test_suite.pem +cp $NOTMUCH_SRCDIR/test/smime/key+cert.pem test_suite.pem FINGERPRINT=$(openssl x509 -fingerprint -in test_suite.pem -noout | sed -e 's/^.*=//' -e s/://g) @@ -41,7 +41,7 @@ test_expect_success \ test_begin_subtest "Signature verification (openssl)" notmuch show --format=raw subject:"test signed message 001" |\ - openssl smime -verify -CAfile $TEST_DIRECTORY/smime/test.crt 2>OUTPUT + openssl smime -verify -CAfile $NOTMUCH_SRCDIR/test/smime/test.crt 2>OUTPUT cat < EXPECTED Verification successful EOF @@ -86,7 +86,7 @@ test_expect_equal_json \ test_begin_subtest "Decryption and signature verification (openssl)" notmuch show --format=raw subject:"test encrypted message 001" |\ openssl smime -decrypt -recip test_suite.pem |\ - openssl smime -verify -CAfile $TEST_DIRECTORY/smime/test.crt 2>OUTPUT + openssl smime -verify -CAfile $NOTMUCH_SRCDIR/test/smime/test.crt 2>OUTPUT cat < EXPECTED Verification successful EOF -- 2.11.0