test: use source and build paths in T355-smime.sh

Make a distinction between source and build directories.
This commit is contained in:
Jani Nikula 2017-09-25 23:38:33 +03:00 committed by David Bremner
parent f6b098b1a6
commit bc349ad316

View file

@ -10,7 +10,7 @@ add_gpgsm_home ()
_gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
at_exit_function _gnupg_exit at_exit_function _gnupg_exit
mkdir -m 0700 "$GNUPGHOME" 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') fpr=$(gpgsm --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p')
echo "$fpr S relax" >> $GNUPGHOME/trustlist.txt echo "$fpr S relax" >> $GNUPGHOME/trustlist.txt
test_debug "cat $GNUPGHOME/import.log" test_debug "cat $GNUPGHOME/import.log"
@ -19,7 +19,7 @@ add_gpgsm_home ()
test_require_external_prereq openssl test_require_external_prereq openssl
test_require_external_prereq gpgsm 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) 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)" test_begin_subtest "Signature verification (openssl)"
notmuch show --format=raw subject:"test signed message 001" |\ 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 <<EOF > EXPECTED cat <<EOF > EXPECTED
Verification successful Verification successful
EOF EOF
@ -86,7 +86,7 @@ test_expect_equal_json \
test_begin_subtest "Decryption and signature verification (openssl)" test_begin_subtest "Decryption and signature verification (openssl)"
notmuch show --format=raw subject:"test encrypted message 001" |\ notmuch show --format=raw subject:"test encrypted message 001" |\
openssl smime -decrypt -recip test_suite.pem |\ 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 <<EOF > EXPECTED cat <<EOF > EXPECTED
Verification successful Verification successful
EOF EOF