diff options
| author | Jani Nikula <jani@nikula.org> | 2017-09-25 23:38:33 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-20 20:49:18 -0300 |
| commit | bc349ad3160a7bb0f6b9abf8098c561badc7d6e1 (patch) | |
| tree | 49c2251f0e2cc920b8fcca0e71fc7ed17f81053c | |
| parent | f6b098b1a6adf5646a9246129bfaff443db0b467 (diff) | |
test: use source and build paths in T355-smime.sh
Make a distinction between source and build directories.
| -rwxr-xr-x | test/T355-smime.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/T355-smime.sh b/test/T355-smime.sh index b813b6ca..1523f17b 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 <<EOF > 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 <<EOF > EXPECTED Verification successful EOF |