Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index da91de8d25e1db346ecca2b682ba54910f20c71e..f53617258ae8bfca73642de89b7d39eadad03354 100755 (executable)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -351,8 +351,11 @@ ${additional_headers}"
 ${additional_headers}"
     fi
 
+    # Note that in the way we're setting it above and using it below,
+    # `additional_headers' will also serve as the header / body separator
+    # (empty line in between).
 
-cat <<EOF >"$gen_msg_filename"
+    cat <<EOF >"$gen_msg_filename"
 From: ${template[from]}
 To: ${template[to]}
 Message-Id: <${gen_msg_id}>
@@ -403,7 +406,7 @@ test_begin_subtest ()
     test_subtest_name="$1"
     # Remember stdout and stderr file descriptios and redirect test
     # output to the previously prepared file descriptors 3 and 4 (see
-    # bellow)
+    # below)
     if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi
     exec 6>&1 7>&2 >&3 2>&4
     inside_subtest=t
@@ -454,6 +457,9 @@ test_expect_equal_failure ()
                        test_known_broken_ok_ "$test_subtest_name"
                else
                        test_known_broken_failure_ "$test_subtest_name"
+                       testname=$this_test.$test_count
+                       echo "$expected" > $testname.expected
+                       echo "$output" > $testname.output
                fi
     fi
 }
@@ -754,7 +760,9 @@ test_done () {
        echo
 
        if [ "$test_failure" = "0" ]; then
-           rm -rf "$remove_tmp"
+           if [ "$test_broken" = "0" ]; then       
+               rm -rf "$remove_tmp"
+           fi
            exit 0
        else
            exit 1