Merge tag 'debian/0.32.3-1'

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index f83f7c6aab25d8c040b25378074616a5f1167f19..1dbc6f7fd5456b31dda9f24d11d40760b4f6edb9 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -131,6 +131,7 @@ add_gnupg_home () {
     # Change this if we ship a new test key
     FINGERPRINT="5AEAB11F5E33DCE875DDB75B6D92612D94E46381"
     SELF_USERID="Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"
+    SELF_EMAIL="test_suite@notmuchmail.org"
     printf '%s:6:\n' "$FINGERPRINT" | gpg --quiet --batch --no-tty --import-ownertrust
 }
 
@@ -860,7 +861,7 @@ test_when_finished () {
 test_done () {
        GIT_EXIT_OK=t
        test_results_dir="$TEST_DIRECTORY/test-results"
-       test -d "$test_results_dir" || mkdir "$test_results_dir"
+       mkdir -p "$test_results_dir"
        test_results_path="$test_results_dir/$this_test"
 
        printf %s\\n \