Make a distinction between source and build directories.
---
test/T160-json.sh | 4 ++--
test/T170-sexp.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/T160-json.sh b/test/T160-json.sh
index 765b78a6746d..91b98e5d6bdc 100755
--- a/test/T160-json.sh
+++ b/test/T160-json.sh
@@ -41,13 +41,13 @@ id="json-show-inline-attachment-filen...@notmuchmail.org"
emacs_fcc_message \
"$subject" \
'This is a test message with inline attachment with a filename' \
- "(mml-attach-file \"$TEST_DIRECTORY/README\" nil nil \"inline\")
+ "(mml-attach-file \"$NOTMUCH_SRCDIR/test/README\" nil nil \"inline\")
(message-goto-eoh)
(insert \"Message-ID: <$id>\n\")"
output=$(notmuch show --format=json "id:$id")
filename=$(notmuch search --output=files "id:$id")
# Get length of README after base64-encoding, minus additional newline.
-attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))
+attachment_length=$(( $(base64 $NOTMUCH_SRCDIR/test/README | wc -c) - 1 ))
test_expect_equal_json "$output" "[[[{\"id\": \"$id\", \"match\": true,
\"excluded\": false, \"filename\": [\"$filename\"], \"timestamp\": 946728000,
\"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\"], \"headers\":
{\"Subject\": \"$subject\", \"From\": \"Notmuch Test Suite
<test_su...@notmuchmail.org>\", \"To\": \"test_su...@notmuchmail.org\",
\"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1,
\"content-type\": \"multipart/mixed\", \"content\": [{\"id\": 2,
\"content-type\": \"text/plain\", \"content\": \"This is a test message with
inline attachment with a filename\"}, {\"id\": 3, \"content-type\":
\"application/octet-stream\", \"content-length\": $attachment_length,
\"content-transfer-encoding\": \"base64\", \"content-disposition\": \"inline\",
\"filename\": \"README\"}]}]}, []]]]"
test_begin_subtest "Search message: json, utf-8"
diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh
index 1125fdc91ec0..c3dcf52a8294 100755
--- a/test/T170-sexp.sh
+++ b/test/T170-sexp.sh
@@ -37,13 +37,13 @@ id="sexp-show-inline-attachment-filen...@notmuchmail.org"
emacs_fcc_message \
"$subject" \
'This is a test message with inline attachment with a filename' \
- "(mml-attach-file \"$TEST_DIRECTORY/README\" nil nil \"inline\")
+ "(mml-attach-file \"$NOTMUCH_SRCDIR/test/README\" nil nil \"inline\")
(message-goto-eoh)
(insert \"Message-ID: <$id>\n\")"
output=$(notmuch show --format=sexp "id:$id")
filename=$(notmuch search --output=files "id:$id")
# Get length of README after base64-encoding, minus additional newline.
-attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))
+attachment_length=$(( $(base64 $NOTMUCH_SRCDIR/test/README | wc -c) - 1 ))
test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename
(\"$filename\") :timestamp 946728000 :date_relative \"2000-01-01\" :tags
(\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From
\"Notmuch Test Suite <test_su...@notmuchmail.org>\" :To
\"test_su...@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body
((:id 1 :content-type \"multipart/mixed\" :content ((:id 2 :content-type
\"text/plain\" :content \"This is a test message with inline attachment with a
filename\") (:id 3 :content-type \"application/octet-stream\"
:content-disposition \"inline\" :filename \"README\" :content-transfer-encoding
\"base64\" :content-length $attachment_length))))) ())))"
test_done
--
2.11.0
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
