--- /dev/null
+Return-Path: <tomi.ollila@nixu.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id A5895429E26\r
+ for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 06:57:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 7gXfyHGNQW0i for <notmuch@notmuchmail.org>;\r
+ Mon, 12 Dec 2011 06:57:28 -0800 (PST)\r
+Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id AD64F429E25\r
+ for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 06:57:27 -0800 (PST)\r
+Received: from pps.filterd (mail-gw3 [127.0.0.1])\r
+ by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id pBCEuBH0012313\r
+ for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 16:57:23 +0200\r
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])\r
+ by mail-gw3.nixu.fi with ESMTP id 114cs0suua-1\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)\r
+ for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 16:57:23 +0200\r
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])\r
+ by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id\r
+ pBCEvLvd024581\r
+ for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 16:57:22 +0200\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: <notmuch@notmuchmail.org>\r
+Subject: [PATCH] test/smtp-dummy: add --background option for backgrounding\r
+ after listen(2)\r
+User-Agent: Notmuch/0.10.2+93~g631d290 (http://notmuchmail.org) Emacs/23.3.1\r
+ (i686-pc-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 12 Dec 2011 16:57:21 +0200\r
+Message-ID: <yf6obvdn8ha.fsf@taco2.nixu.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110,\r
+ 1.0.211, 0.0.0000 definitions=2011-12-12_02:2011-12-12, 2011-12-12,\r
+ 1970-01-01 signatures=0\r
+X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0\r
+ ipscore=0 suspectscore=1\r
+ phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0\r
+ reason=mlx\r
+ scancount=1 engine=6.0.2-1012030000 definitions=main-1112120114\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 12 Dec 2011 14:57:28 -0000\r
+\r
+To avoid the possibility that smtp-dummy doesn't have chance to listen\r
+its bound socket until something tries to send message to it this\r
+option can be used for caller to wait until socket is already listening\r
+for a connection.\r
+---\r
+\r
+When test_require_external_prereq() is changed to use associative\r
+array to check whether prereq is missing bash script is often \r
+so fast that it already waiting for smtp-dummy to exit until\r
+socket is listening. i.e sending QUIT to 127.0.0.1:25025 fails\r
+since there is no listener. (fork(2) & execve(2) count goes to zero\r
+in test_require_external_prereq (from 3 fork()s, 2 execve()s).\r
+\r
+ test/smtp-dummy.c | 28 +++++++++++++++++++++++++++-\r
+ 1 files changed, 27 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c\r
+index 3801a5e..40196dd 100644\r
+--- a/test/smtp-dummy.c\r
++++ b/test/smtp-dummy.c\r
+@@ -124,9 +124,21 @@ main (int argc, char *argv[])\r
+ struct hostent *hostinfo;\r
+ socklen_t peer_addr_len;\r
+ int reuse;\r
++ int bg;\r
++\r
++ /* XXX quick implementation -- fix if more functionality is desired. */\r
++ if (argc >= 2 && strcmp(argv[1], "--background") == 0) {\r
++ argc--;\r
++ argv[1] = argv[0];\r
++ argv++;\r
++ bg = 1;\r
++ }\r
++ else\r
++ bg = 0;\r
+ \r
+ if (argc != 2) {\r
+- fprintf (stderr, "Usage: %s <output-file>\n", argv[0]);\r
++ fprintf (stderr, "Usage: %s [--background] <output-file>\n",\r
++ argv[0]);\r
+ return 1;\r
+ }\r
+ \r
+@@ -179,6 +191,20 @@ main (int argc, char *argv[])\r
+ return 1;\r
+ }\r
+ \r
++ if (bg) {\r
++ switch (fork ()) {\r
++ case 0:\r
++ break;\r
++ case -1:\r
++ fprintf (stderr, "Error: fork() failed: %s\n",\r
++ strerror (errno));\r
++ close (sock);\r
++ return 1;\r
++ default:\r
++ return 0;\r
++ }\r
++ }\r
++\r
+ peer_addr_len = sizeof (peer_addr);\r
+ peer = accept (sock, (struct sockaddr *) &peer_addr, &peer_addr_len);\r
+ if (peer == -1) {\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff