From 2c40cdb8c953a7573e181bd585e15b01bf3c0786 Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Mon, 12 May 2014 13:29:27 +0100 Subject: [PATCH] [PATCH v3 7/9] test: Update the test output to accord with the reply changes --- aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5 | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5 diff --git a/aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5 b/aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5 new file mode 100644 index 000000000..e11613eb6 --- /dev/null +++ b/aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5 @@ -0,0 +1,124 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 25603429E47 + for ; Mon, 12 May 2014 05:30:01 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id FQ6WAbDDOCPa for ; + Mon, 12 May 2014 05:29:53 -0700 (PDT) +Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com + [74.125.82.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + E35A0431FDD for ; Mon, 12 May 2014 05:29:35 -0700 + (PDT) +Received: by mail-wg0-f42.google.com with SMTP id y10so6634517wgg.1 + for ; Mon, 12 May 2014 05:29:34 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to + :references; + bh=eovorpLemshKjdVmS8WUHw9flNb3ENbFR0Vba0wbvhg=; + b=Nj5srhsAIbHdXoYJcoVv9dvvUt2jF85+E9+rI/zLi0x/A2YliR2cSoTk1JpI89C2SZ + RjCP+GERyhhOc3AN3GagfXSqmQo4wTuItRJquMyIpLrA0uvM6jxkGlMTg3vYEBVS7YOa + MaG0h/dEKGiTfAeMGDZjatjb10Q8Fk2d+D006xs0kC9tlddTY0CI7j8X2hB1lavn2BLp + XSxbh35fmIjYaq8kJVX2xxXHqVbDzvMuNVNs2jc+CprSYVgEo0Icy5rL5esHggOT0HNG + rFczKgvc0yyGJWZh9j2OQROH7XJVgyJXKR273PJ9LRa1rB9AOTKyADEcLASgJLON+6+1 + HE8w== +X-Gm-Message-State: + ALoCoQmiC4kBpAKKdToV/CyEJHusiP+FdUxSp89qXz6n96flmQnk/wEriNd2whmAK8l+Evf7sKZE +X-Received: by 10.180.91.1 with SMTP id ca1mr15642443wib.32.1399897774729; + Mon, 12 May 2014 05:29:34 -0700 (PDT) +Received: from hotblack-desiato.hh.sledj.net + ([2a01:348:1a2:1:a288:b4ff:fe8a:77d8]) + by mx.google.com with ESMTPSA id + nb8sm15859883wic.18.2014.05.12.05.29.32 for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 12 May 2014 05:29:32 -0700 (PDT) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 4805110B32E; Mon, 12 May 2014 13:29:29 +0100 (BST) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v3 7/9] test: Update the test output to accord with the reply + changes +Date: Mon, 12 May 2014 13:29:27 +0100 +Message-Id: <1399897769-26809-8-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.0.0.rc0 +In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org> +References: <87sixdujkv.fsf@qmul.ac.uk> + <1399897769-26809-1-git-send-email-dme@dme.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 12 May 2014 12:30:01 -0000 + +Replying to a message with multiple parts will now typically include +content from several parts (whereas previously only the first part was +used). Update the expected output from the emacs reply tests +accordingly. +--- + test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh +index ac966e5..95bb67e 100755 +--- a/test/T310-emacs.sh ++++ b/test/T310-emacs.sh +@@ -473,6 +473,38 @@ Alex Botero-Lowry writes: + > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically + > uses 64 as the + > buffer size. ++> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001 ++> From: Alexander Botero-Lowry ++> Date: Tue, 17 Nov 2009 11:30:39 -0800 ++> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 ++> ++> --- ++> notmuch-config.c | 2 ++ ++> 1 files changed, 2 insertions(+), 0 deletions(-) ++> ++> diff --git a/notmuch-config.c b/notmuch-config.c ++> index 248149c..e7220d8 100644 ++> --- a/notmuch-config.c ++> +++ b/notmuch-config.c ++> @@ -77,6 +77,7 @@ static char * ++> get_name_from_passwd_file (void *ctx) ++> { ++> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); ++> + if (pw_buf_size == -1) pw_buf_size = 64; ++> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); ++> struct passwd passwd, *ignored; ++> char *name; ++> @@ -101,6 +102,7 @@ static char * ++> get_username_from_passwd_file (void *ctx) ++> { ++> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); ++> + if (pw_buf_size == -1) pw_buf_size = 64; ++> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); ++> struct passwd passwd, *ignored; ++> char *name; ++> -- ++> 1.6.5.2 ++> + > _______________________________________________ + > notmuch mailing list + > notmuch@notmuchmail.org +-- +2.0.0.rc0 + -- 2.26.2