- quilt/main.in: Add a --signature flag that allows to override

  the signature used. (The test suite still depended on the
  .signature file of the user runnig it; fixed now.)

1 files changed, 7 insertions, 7 deletions

diff --git a/test/mail.test b/test/mail.test
index 86d8857..7812752 100644
--- a/test/mail.test
+++ b/test/mail.test
@@ -63,28 +63,28 @@
 	<
 
 	$ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message"
-	$ grep -e '^Subject:' -e '^To:' -e '^Cc:' -e '^-- $' -e '^ ' mbox
+	$ sed -nre "s/^(From [^ ]*).*/\\1/p" -e "/^Subject:/p" -e "/^To:/p" -e "/^Cc:/p" -e "/^ /p" mbox
+	> From a@b.c
 	> Subject: [test 0/5] This is a test
-	> -- 
+	> From a@b.c
 	> Cc: Dummy <dummy@some.where>
 	> Subject: [test 1/5] Subject of 1.diff
-	> -- 
+	> From a@b.c
 	> Cc: Dummy <dummy@some.where>
 	> Subject: [test 2/5] Subject of 2.diff is: split into multiple lines
-	> -- 
+	> From a@b.c
 	> To: "John X. Doe" <jxd@some.where>
 	> Subject: [test 3/5] Subject of 3.diff
 	> To: John X. Doe <jxd@some.where>
-	> -- 
+	> From a@b.c
 	> Cc: "Joe R. Hacker" <joe@foo.baz>,
 	>  "John X. Doe" <jxd@some.where>,
 	>  =?UTF-8?q?=C3=9C=20is=20an=20umlaut?= <used@in.german>
 	> Subject: [test 4/5] First paragraph used as subject of 4.diff.
 	> Cc: "John X. Doe" <jxd@some.where>
 	> Cc: Ü is an umlaut <used@in.german>
-	> -- 
+	> From a@b.c
 	> Subject: [test 5/5] Subject of 5.diff
-	> -- 
 
 	$ cd ..
 	$ rm -rf d