@matheusbsbs / matheus-bagliano / commits / 57cd35e6ad
Fork 0

t/t9001-send-email.sh: change from skip_all=* to prereq skip

Change this test to skip test with test prerequisites, and to do setup work in tests. This improves the skipped statistics on platforms where the test isn't run. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Aug 13, 2010 at 20:40 UTC 57cd35e6adc68a33163136ef416ffa43b4821ab0
1 file changed +83 -82
t/t9001-send-email.sh
+83 -82
@@ -3,19 +3,17 @@
3 test_description='git send-email'
4 . ./test-lib.sh
5
6 -if ! test_have_prereq PERL; then
7 - skip_all='skipping git send-email tests, perl not available'
8 - test_done
9 -fi
6 +# May be altered later in the test
7 +PREREQ="PERL"
8
11 -test_expect_success \
9 +test_expect_success $PREREQ \
10 'prepare reference tree' \
11 'echo "1A quick brown fox jumps over the" >file &&
12 echo "lazy dog" >>file &&
13 git add file &&
14 GIT_AUTHOR_NAME="A" git commit -a -m "Initial."'
15
18 -test_expect_success \
16 +test_expect_success $PREREQ \
17 'Setup helper tool' \
18 '(echo "#!$SHELL_PATH"
19 echo shift
@@ -35,7 +33,7 @@ clean_fake_sendmail() {
33 rm -f commandline* msgtxt*
34 }
35
38 -test_expect_success 'Extract patches' '
36 +test_expect_success $PREREQ 'Extract patches' '
37 patches=`git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1`
38 '
39
@@ -56,31 +54,34 @@ test_no_confirm () {
54
55 # Exit immediately to prevent hang if a no-confirm test fails
56 check_no_confirm () {
59 - test -f no_confirm_okay || {
60 - skip_all='confirm test failed; skipping remaining tests to prevent hanging'
61 - test_done
62 - }
57 + if ! test -f no_confirm_okay
58 + then
59 + say 'confirm test failed; skipping remaining tests to prevent hanging'
60 + PREREQ="$PREREQ,CHECK_NO_CONFIRM"
61 + fi
62 + return 0
63 }
64
65 -test_expect_success 'No confirm with --suppress-cc' '
66 - test_no_confirm --suppress-cc=sob
65 +test_expect_success $PREREQ 'No confirm with --suppress-cc' '
66 + test_no_confirm --suppress-cc=sob &&
67 + check_no_confirm
68 '
68 -check_no_confirm
69
70 -test_expect_success 'No confirm with --confirm=never' '
71 - test_no_confirm --confirm=never
70 +
71 +test_expect_success $PREREQ 'No confirm with --confirm=never' '
72 + test_no_confirm --confirm=never &&
73 + check_no_confirm
74 '
73 -check_no_confirm
75
76 # leave sendemail.confirm set to never after this so that none of the
77 # remaining tests prompt unintentionally.
77 -test_expect_success 'No confirm with sendemail.confirm=never' '
78 +test_expect_success $PREREQ 'No confirm with sendemail.confirm=never' '
79 git config sendemail.confirm never &&
79 - test_no_confirm --compose --subject=foo
80 + test_no_confirm --compose --subject=foo &&
81 + check_no_confirm
82 '
81 -check_no_confirm
83
83 -test_expect_success 'Send patches' '
84 +test_expect_success $PREREQ 'Send patches' '
85 git send-email --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
86 '
87
@@ -90,11 +91,11 @@ cat >expected <<\EOF
91 !one@example.com!
92 !two@example.com!
93 EOF
93 -test_expect_success \
94 +test_expect_success $PREREQ \
95 'Verify commandline' \
96 'test_cmp expected commandline1'
97
97 -test_expect_success 'Send patches with --envelope-sender' '
98 +test_expect_success $PREREQ 'Send patches with --envelope-sender' '
99 clean_fake_sendmail &&
100 git send-email --envelope-sender="Patch Contributer <patch@example.com>" --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
101 '
@@ -107,11 +108,11 @@ cat >expected <<\EOF
108 !one@example.com!
109 !two@example.com!
110 EOF
110 -test_expect_success \
111 +test_expect_success $PREREQ \
112 'Verify commandline' \
113 'test_cmp expected commandline1'
114
114 -test_expect_success 'Send patches with --envelope-sender=auto' '
115 +test_expect_success $PREREQ 'Send patches with --envelope-sender=auto' '
116 clean_fake_sendmail &&
117 git send-email --envelope-sender=auto --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
118 '
@@ -124,7 +125,7 @@ cat >expected <<\EOF
125 !one@example.com!
126 !two@example.com!
127 EOF
127 -test_expect_success \
128 +test_expect_success $PREREQ \
129 'Verify commandline' \
130 'test_cmp expected commandline1'
131
@@ -158,7 +159,7 @@ References: <unique-message-id@example.com>
159 Result: OK
160 EOF
161
161 -test_expect_success 'Show all headers' '
162 +test_expect_success $PREREQ 'Show all headers' '
163 git send-email \
164 --dry-run \
165 --suppress-cc=sob \
@@ -176,7 +177,7 @@ test_expect_success 'Show all headers' '
177 test_cmp expected-show-all-headers actual-show-all-headers
178 '
179
179 -test_expect_success 'Prompting works' '
180 +test_expect_success $PREREQ 'Prompting works' '
181 clean_fake_sendmail &&
182 (echo "Example <from@example.com>"
183 echo "to@example.com"
@@ -189,7 +190,7 @@ test_expect_success 'Prompting works' '
190 grep "^To: to@example.com\$" msgtxt1
191 '
192
192 -test_expect_success 'cccmd works' '
193 +test_expect_success $PREREQ 'cccmd works' '
194 clean_fake_sendmail &&
195 cp $patches cccmd.patch &&
196 echo cccmd--cccmd@example.com >>cccmd.patch &&
@@ -211,7 +212,7 @@ test_expect_success 'cccmd works' '
212 z8=zzzzzzzz
213 z64=$z8$z8$z8$z8$z8$z8$z8$z8
214 z512=$z64$z64$z64$z64$z64$z64$z64$z64
214 -test_expect_success 'reject long lines' '
215 +test_expect_success $PREREQ 'reject long lines' '
216 clean_fake_sendmail &&
217 cp $patches longline.patch &&
218 echo $z512$z512 >>longline.patch &&
@@ -224,11 +225,11 @@ test_expect_success 'reject long lines' '
225 grep longline.patch errors
226 '
227
227 -test_expect_success 'no patch was sent' '
228 +test_expect_success $PREREQ 'no patch was sent' '
229 ! test -e commandline1
230 '
231
231 -test_expect_success 'Author From: in message body' '
232 +test_expect_success $PREREQ 'Author From: in message body' '
233 clean_fake_sendmail &&
234 git send-email \
235 --from="Example <nobody@example.com>" \
@@ -239,7 +240,7 @@ test_expect_success 'Author From: in message body' '
240 grep "From: A <author@example.com>" msgbody1
241 '
242
242 -test_expect_success 'Author From: not in message body' '
243 +test_expect_success $PREREQ 'Author From: not in message body' '
244 clean_fake_sendmail &&
245 git send-email \
246 --from="A <author@example.com>" \
@@ -250,7 +251,7 @@ test_expect_success 'Author From: not in message body' '
251 ! grep "From: A <author@example.com>" msgbody1
252 '
253
253 -test_expect_success 'allow long lines with --no-validate' '
254 +test_expect_success $PREREQ 'allow long lines with --no-validate' '
255 git send-email \
256 --from="Example <nobody@example.com>" \
257 --to=nobody@example.com \
@@ -260,7 +261,7 @@ test_expect_success 'allow long lines with --no-validate' '
261 2>errors
262 '
263
263 -test_expect_success 'Invalid In-Reply-To' '
264 +test_expect_success $PREREQ 'Invalid In-Reply-To' '
265 clean_fake_sendmail &&
266 git send-email \
267 --from="Example <nobody@example.com>" \
@@ -272,7 +273,7 @@ test_expect_success 'Invalid In-Reply-To' '
273 ! grep "^In-Reply-To: < *>" msgtxt1
274 '
275
275 -test_expect_success 'Valid In-Reply-To when prompting' '
276 +test_expect_success $PREREQ 'Valid In-Reply-To when prompting' '
277 clean_fake_sendmail &&
278 (echo "From Example <from@example.com>"
279 echo "To Example <to@example.com>"
@@ -283,7 +284,7 @@ test_expect_success 'Valid In-Reply-To when prompting' '
284 ! grep "^In-Reply-To: < *>" msgtxt1
285 '
286
286 -test_expect_success 'setup fake editor' '
287 +test_expect_success $PREREQ 'setup fake editor' '
288 (echo "#!$SHELL_PATH" &&
289 echo "echo fake edit >>\"\$1\""
290 ) >fake-editor &&
@@ -292,7 +293,7 @@ test_expect_success 'setup fake editor' '
293
294 test_set_editor "$(pwd)/fake-editor"
295
295 -test_expect_success '--compose works' '
296 +test_expect_success $PREREQ '--compose works' '
297 clean_fake_sendmail &&
298 git send-email \
299 --compose --subject foo \
@@ -303,11 +304,11 @@ test_expect_success '--compose works' '
304 2>errors
305 '
306
306 -test_expect_success 'first message is compose text' '
307 +test_expect_success $PREREQ 'first message is compose text' '
308 grep "^fake edit" msgtxt1
309 '
310
310 -test_expect_success 'second message is patch' '
311 +test_expect_success $PREREQ 'second message is patch' '
312 grep "Subject:.*Second" msgtxt2
313 '
314
@@ -353,7 +354,7 @@ test_suppression () {
354 test_cmp expected-suppress-$1${2+"-$2"} actual-suppress-$1${2+"-$2"}
355 }
356
356 -test_expect_success 'sendemail.cc set' '
357 +test_expect_success $PREREQ 'sendemail.cc set' '
358 git config sendemail.cc cc@example.com &&
359 test_suppression sob
360 '
@@ -383,7 +384,7 @@ X-Mailer: X-MAILER-STRING
384 Result: OK
385 EOF
386
386 -test_expect_success 'sendemail.cc unset' '
387 +test_expect_success $PREREQ 'sendemail.cc unset' '
388 git config --unset sendemail.cc &&
389 test_suppression sob
390 '
@@ -416,7 +417,7 @@ X-Mailer: X-MAILER-STRING
417 Result: OK
418 EOF
419
419 -test_expect_success 'sendemail.cccmd' '
420 +test_expect_success $PREREQ 'sendemail.cccmd' '
421 echo echo cc-cmd@example.com > cccmd &&
422 chmod +x cccmd &&
423 git config sendemail.cccmd ./cccmd &&
@@ -439,7 +440,7 @@ X-Mailer: X-MAILER-STRING
440 Result: OK
441 EOF
442
442 -test_expect_success '--suppress-cc=all' '
443 +test_expect_success $PREREQ '--suppress-cc=all' '
444 test_suppression all
445 '
446
@@ -471,7 +472,7 @@ X-Mailer: X-MAILER-STRING
472 Result: OK
473 EOF
474
474 -test_expect_success '--suppress-cc=body' '
475 +test_expect_success $PREREQ '--suppress-cc=body' '
476 test_suppression body
477 '
478
@@ -500,7 +501,7 @@ X-Mailer: X-MAILER-STRING
501 Result: OK
502 EOF
503
503 -test_expect_success '--suppress-cc=body --suppress-cc=cccmd' '
504 +test_expect_success $PREREQ '--suppress-cc=body --suppress-cc=cccmd' '
505 test_suppression body cccmd
506 '
507
@@ -529,7 +530,7 @@ X-Mailer: X-MAILER-STRING
530 Result: OK
531 EOF
532
532 -test_expect_success '--suppress-cc=sob' '
533 +test_expect_success $PREREQ '--suppress-cc=sob' '
534 git config --unset sendemail.cccmd
535 test_suppression sob
536 '
@@ -562,7 +563,7 @@ X-Mailer: X-MAILER-STRING
563 Result: OK
564 EOF
565
565 -test_expect_success '--suppress-cc=bodycc' '
566 +test_expect_success $PREREQ '--suppress-cc=bodycc' '
567 test_suppression bodycc
568 '
569
@@ -588,7 +589,7 @@ X-Mailer: X-MAILER-STRING
589 Result: OK
590 EOF
591
591 -test_expect_success '--suppress-cc=cc' '
592 +test_expect_success $PREREQ '--suppress-cc=cc' '
593 test_suppression cc
594 '
595
@@ -603,23 +604,23 @@ test_confirm () {
604 grep "Send this email" stdout
605 }
606
606 -test_expect_success '--confirm=always' '
607 +test_expect_success $PREREQ '--confirm=always' '
608 test_confirm --confirm=always --suppress-cc=all
609 '
610
610 -test_expect_success '--confirm=auto' '
611 +test_expect_success $PREREQ '--confirm=auto' '
612 test_confirm --confirm=auto
613 '
614
614 -test_expect_success '--confirm=cc' '
615 +test_expect_success $PREREQ '--confirm=cc' '
616 test_confirm --confirm=cc
617 '
618
618 -test_expect_success '--confirm=compose' '
619 +test_expect_success $PREREQ '--confirm=compose' '
620 test_confirm --confirm=compose --compose
621 '
622
622 -test_expect_success 'confirm by default (due to cc)' '
623 +test_expect_success $PREREQ 'confirm by default (due to cc)' '
624 CONFIRM=$(git config --get sendemail.confirm) &&
625 git config --unset sendemail.confirm &&
626 test_confirm
@@ -628,7 +629,7 @@ test_expect_success 'confirm by default (due to cc)' '
629 test $ret = "0"
630 '
631
631 -test_expect_success 'confirm by default (due to --compose)' '
632 +test_expect_success $PREREQ 'confirm by default (due to --compose)' '
633 CONFIRM=$(git config --get sendemail.confirm) &&
634 git config --unset sendemail.confirm &&
635 test_confirm --suppress-cc=all --compose
@@ -637,7 +638,7 @@ test_expect_success 'confirm by default (due to --compose)' '
638 test $ret = "0"
639 '
640
640 -test_expect_success 'confirm detects EOF (inform assumes y)' '
641 +test_expect_success $PREREQ 'confirm detects EOF (inform assumes y)' '
642 CONFIRM=$(git config --get sendemail.confirm) &&
643 git config --unset sendemail.confirm &&
644 rm -fr outdir &&
@@ -653,7 +654,7 @@ test_expect_success 'confirm detects EOF (inform assumes y)' '
654 test $ret = "0"
655 '
656
656 -test_expect_success 'confirm detects EOF (auto causes failure)' '
657 +test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' '
658 CONFIRM=$(git config --get sendemail.confirm) &&
659 git config sendemail.confirm auto &&
660 GIT_SEND_EMAIL_NOTTY=1 &&
@@ -668,7 +669,7 @@ test_expect_success 'confirm detects EOF (auto causes failure)' '
669 test $ret = "0"
670 '
671
671 -test_expect_success 'confirm doesnt loop forever' '
672 +test_expect_success $PREREQ 'confirm doesnt loop forever' '
673 CONFIRM=$(git config --get sendemail.confirm) &&
674 git config sendemail.confirm auto &&
675 GIT_SEND_EMAIL_NOTTY=1 &&
@@ -683,7 +684,7 @@ test_expect_success 'confirm doesnt loop forever' '
684 test $ret = "0"
685 '
686
686 -test_expect_success 'utf8 Cc is rfc2047 encoded' '
687 +test_expect_success $PREREQ 'utf8 Cc is rfc2047 encoded' '
688 clean_fake_sendmail &&
689 rm -fr outdir &&
690 git format-patch -1 -o outdir --cc="àéìöú <utf8@example.com>" &&
@@ -696,7 +697,7 @@ test_expect_success 'utf8 Cc is rfc2047 encoded' '
697 grep "=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@example.com>"
698 '
699
699 -test_expect_success '--compose adds MIME for utf8 body' '
700 +test_expect_success $PREREQ '--compose adds MIME for utf8 body' '
701 clean_fake_sendmail &&
702 (echo "#!$SHELL_PATH" &&
703 echo "echo utf8 body: àéìöú >>\"\$1\""
@@ -713,7 +714,7 @@ test_expect_success '--compose adds MIME for utf8 body' '
714 grep "^Content-Type: text/plain; charset=UTF-8" msgtxt1
715 '
716
716 -test_expect_success '--compose respects user mime type' '
717 +test_expect_success $PREREQ '--compose respects user mime type' '
718 clean_fake_sendmail &&
719 (echo "#!$SHELL_PATH" &&
720 echo "(echo MIME-Version: 1.0"
@@ -736,7 +737,7 @@ test_expect_success '--compose respects user mime type' '
737 ! grep "^Content-Type: text/plain; charset=UTF-8" msgtxt1
738 '
739
739 -test_expect_success '--compose adds MIME for utf8 subject' '
740 +test_expect_success $PREREQ '--compose adds MIME for utf8 subject' '
741 clean_fake_sendmail &&
742 GIT_EDITOR="\"$(pwd)/fake-editor\"" \
743 git send-email \
@@ -749,7 +750,7 @@ test_expect_success '--compose adds MIME for utf8 subject' '
750 grep "^Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1
751 '
752
752 -test_expect_success 'detects ambiguous reference/file conflict' '
753 +test_expect_success $PREREQ 'detects ambiguous reference/file conflict' '
754 echo master > master &&
755 git add master &&
756 git commit -m"add master" &&
@@ -757,7 +758,7 @@ test_expect_success 'detects ambiguous reference/file conflict' '
758 grep disambiguate errors
759 '
760
760 -test_expect_success 'feed two files' '
761 +test_expect_success $PREREQ 'feed two files' '
762 rm -fr outdir &&
763 git format-patch -2 -o outdir &&
764 git send-email \
@@ -770,7 +771,7 @@ test_expect_success 'feed two files' '
771 test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
772 '
773
773 -test_expect_success 'in-reply-to but no threading' '
774 +test_expect_success $PREREQ 'in-reply-to but no threading' '
775 git send-email \
776 --dry-run \
777 --from="Example <nobody@example.com>" \
@@ -781,7 +782,7 @@ test_expect_success 'in-reply-to but no threading' '
782 grep "In-Reply-To: <in-reply-id@example.com>"
783 '
784
784 -test_expect_success 'no in-reply-to and no threading' '
785 +test_expect_success $PREREQ 'no in-reply-to and no threading' '
786 git send-email \
787 --dry-run \
788 --from="Example <nobody@example.com>" \
@@ -791,7 +792,7 @@ test_expect_success 'no in-reply-to and no threading' '
792 ! grep "In-Reply-To: " stdout
793 '
794
794 -test_expect_success 'threading but no chain-reply-to' '
795 +test_expect_success $PREREQ 'threading but no chain-reply-to' '
796 git send-email \
797 --dry-run \
798 --from="Example <nobody@example.com>" \
@@ -802,7 +803,7 @@ test_expect_success 'threading but no chain-reply-to' '
803 grep "In-Reply-To: " stdout
804 '
805
805 -test_expect_success 'warning with an implicit --chain-reply-to' '
806 +test_expect_success $PREREQ 'warning with an implicit --chain-reply-to' '
807 git send-email \
808 --dry-run \
809 --from="Example <nobody@example.com>" \
@@ -811,7 +812,7 @@ test_expect_success 'warning with an implicit --chain-reply-to' '
812 grep "no-chain-reply-to" errors
813 '
814
814 -test_expect_success 'no warning with an explicit --chain-reply-to' '
815 +test_expect_success $PREREQ 'no warning with an explicit --chain-reply-to' '
816 git send-email \
817 --dry-run \
818 --from="Example <nobody@example.com>" \
@@ -821,7 +822,7 @@ test_expect_success 'no warning with an explicit --chain-reply-to' '
822 ! grep "no-chain-reply-to" errors
823 '
824
824 -test_expect_success 'no warning with an explicit --no-chain-reply-to' '
825 +test_expect_success $PREREQ 'no warning with an explicit --no-chain-reply-to' '
826 git send-email \
827 --dry-run \
828 --from="Example <nobody@example.com>" \
@@ -831,7 +832,7 @@ test_expect_success 'no warning with an explicit --no-chain-reply-to' '
832 ! grep "no-chain-reply-to" errors
833 '
834
834 -test_expect_success 'no warning with sendemail.chainreplyto = false' '
835 +test_expect_success $PREREQ 'no warning with sendemail.chainreplyto = false' '
836 git config sendemail.chainreplyto false &&
837 git send-email \
838 --dry-run \
@@ -841,7 +842,7 @@ test_expect_success 'no warning with sendemail.chainreplyto = false' '
842 ! grep "no-chain-reply-to" errors
843 '
844
844 -test_expect_success 'no warning with sendemail.chainreplyto = true' '
845 +test_expect_success $PREREQ 'no warning with sendemail.chainreplyto = true' '
846 git config sendemail.chainreplyto true &&
847 git send-email \
848 --dry-run \
@@ -851,7 +852,7 @@ test_expect_success 'no warning with sendemail.chainreplyto = true' '
852 ! grep "no-chain-reply-to" errors
853 '
854
854 -test_expect_success 'sendemail.to works' '
855 +test_expect_success $PREREQ 'sendemail.to works' '
856 git config --replace-all sendemail.to "Somebody <somebody@ex.com>" &&
857 git send-email \
858 --dry-run \
@@ -860,7 +861,7 @@ test_expect_success 'sendemail.to works' '
861 grep "To: Somebody <somebody@ex.com>" stdout
862 '
863
863 -test_expect_success '--no-to overrides sendemail.to' '
864 +test_expect_success $PREREQ '--no-to overrides sendemail.to' '
865 git send-email \
866 --dry-run \
867 --from="Example <nobody@example.com>" \
@@ -871,7 +872,7 @@ test_expect_success '--no-to overrides sendemail.to' '
872 ! grep "To: Somebody <somebody@ex.com>" stdout
873 '
874
874 -test_expect_success 'sendemail.cc works' '
875 +test_expect_success $PREREQ 'sendemail.cc works' '
876 git config --replace-all sendemail.cc "Somebody <somebody@ex.com>" &&
877 git send-email \
878 --dry-run \
@@ -881,7 +882,7 @@ test_expect_success 'sendemail.cc works' '
882 grep "Cc: Somebody <somebody@ex.com>" stdout
883 '
884
884 -test_expect_success '--no-cc overrides sendemail.cc' '
885 +test_expect_success $PREREQ '--no-cc overrides sendemail.cc' '
886 git send-email \
887 --dry-run \
888 --from="Example <nobody@example.com>" \
@@ -893,7 +894,7 @@ test_expect_success '--no-cc overrides sendemail.cc' '
894 ! grep "Cc: Somebody <somebody@ex.com>" stdout
895 '
896
896 -test_expect_success 'sendemail.bcc works' '
897 +test_expect_success $PREREQ 'sendemail.bcc works' '
898 git config --replace-all sendemail.bcc "Other <other@ex.com>" &&
899 git send-email \
900 --dry-run \
@@ -904,7 +905,7 @@ test_expect_success 'sendemail.bcc works' '
905 grep "RCPT TO:<other@ex.com>" stdout
906 '
907
907 -test_expect_success '--no-bcc overrides sendemail.bcc' '
908 +test_expect_success $PREREQ '--no-bcc overrides sendemail.bcc' '
909 git send-email \
910 --dry-run \
911 --from="Example <nobody@example.com>" \
@@ -933,7 +934,7 @@ Content-Type: text/plain; charset=UTF-8
934 Content-Transfer-Encoding: 8bit
935 EOF
936
936 -test_expect_success 'asks about and fixes 8bit encodings' '
937 +test_expect_success $PREREQ 'asks about and fixes 8bit encodings' '
938 clean_fake_sendmail &&
939 echo |
940 git send-email --from=author@example.com --to=nobody@example.com \
@@ -946,7 +947,7 @@ test_expect_success 'asks about and fixes 8bit encodings' '
947 test_cmp actual content-type-decl
948 '
949
949 -test_expect_success 'sendemail.8bitEncoding works' '
950 +test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
951 clean_fake_sendmail &&
952 git config sendemail.assume8bitEncoding UTF-8 &&
953 echo bogus |
@@ -957,7 +958,7 @@ test_expect_success 'sendemail.8bitEncoding works' '
958 test_cmp actual content-type-decl
959 '
960
960 -test_expect_success '--8bit-encoding overrides sendemail.8bitEncoding' '
961 +test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
962 clean_fake_sendmail &&
963 git config sendemail.assume8bitEncoding "bogus too" &&
964 echo bogus |
@@ -983,7 +984,7 @@ cat >expected <<EOF
984 Subject: =?UTF-8?q?Dieser=20Betreff=20enth=C3=A4lt=20auch=20einen=20Umlaut!?=
985 EOF
986
986 -test_expect_success '--8bit-encoding also treats subject' '
987 +test_expect_success $PREREQ '--8bit-encoding also treats subject' '
988 clean_fake_sendmail &&
989 echo bogus |
990 git send-email --from=author@example.com --to=nobody@example.com \