[PATCH] test: fix test_require_external_prereq gdb in insert test

diff --git a/5f/370eb2aadad90b87da4a5e359b823ec8b7968b b/5f/370eb2aadad90b87da4a5e359b823ec8b7968b
new file mode 100644 (file)
index 0000000..52f3280
--- /dev/null
+++ b/5f/370eb2aadad90b87da4a5e359b823ec8b7968b
@@ -0,0 +1,101 @@
+Return-Path: <jani@nikula.org>\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 80F28431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 10:52:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 xsmcQ+3BHb17 for <notmuch@notmuchmail.org>;\r
+       Tue, 28 Oct 2014 10:52:40 -0700 (PDT)\r
+Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com\r
+ [74.125.82.42])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 5E76B431FB6   for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 10:52:39 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f42.google.com with SMTP id k14so76956wgh.15\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 10:52:37 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=YyL014oV7f6SI0XXQjXFJfMQe+1xKzUS7iiqr2Pd4j0=;\r
+       b=b8pGe/K5R4KTvFZ1w01zhgwsKfRMcqW8f9oDJIFKLVOiRbEZXkbbEeKqD5ocdS6vG8\r
+       8x8x3UlRlBhjcLWMWML4f+4dKIgrN1ZO53H7klStlN0my4vgOo+qVeANGT1u4+guU/2T\r
+       3u4VbL0MajjvS8JAHaLpJt1RnbJpl8mieq5Ev0pAuFiHTF4n56Dbh9h+Sc9dPQOckSsR\r
+       Lhnf+iXN/DSxlCf23JEUPcyx0nqU9Sa+50Vc60CW8+U9qzNuBWUQSSoks1vXCaZ1SxgV\r
+       aoMJcYXWxd9XpG0txKHJguY8+cCM7JD/TcbyT4nYuTTl+EZ4nAyPfntedqaufhGshEzV\r
+       sZew==\r
+X-Gm-Message-State:\r
+ ALoCoQk0Egy9hygI6eAaLk/DKpvD3keeuX8AMFhJVyjWIrac+JyWBhd5BTqy3SABhP43FBTX3Y0U\r
+X-Received: by 10.180.104.198 with SMTP id gg6mr30440914wib.76.1414518756792; \r
+       Tue, 28 Oct 2014 10:52:36 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36d-48.dhcp.inet.fi.\r
+       [88.195.109.48])\r
+       by mx.google.com with ESMTPSA id k10sm2594942wjb.28.2014.10.28.10.52.35\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Tue, 28 Oct 2014 10:52:36 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: fix test_require_external_prereq gdb in insert test\r
+Date: Tue, 28 Oct 2014 19:52:34 +0200\r
+Message-Id: <1414518754-16344-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.1\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: Tue, 28 Oct 2014 17:52:49 -0000\r
+\r
+You need to actually check the return value. Limit the missing deps\r
+part to subtests requiring gdb.\r
+---\r
+ test/T070-insert.sh | 6 ++++--\r
+ 1 file changed, 4 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index 168345c9897b..b21609833228 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -2,8 +2,6 @@\r
+ test_description='"notmuch insert"'\r
+ . ./test-lib.sh\r
+ \r
+-test_require_external_prereq gdb\r
+-\r
+ # Create directories and database before inserting.\r
+ mkdir -p "$MAIL_DIR"/{cur,new,tmp}\r
+ mkdir -p "$MAIL_DIR"/Drafts/{cur,new,tmp}\r
+@@ -185,6 +183,8 @@ test_expect_code 1 "Invalid tags set exit code" \\r
+ \r
+ notmuch config set new.tags $OLDCONFIG\r
+ \r
++if test_require_external_prereq gdb; then\r
++\r
+ # DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass.\r
+ \r
+ for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \\r
+@@ -211,4 +211,6 @@ gdb --batch-silent --return-child-result -x index-file-$code.gdb \\r
+ test_expect_equal $? 0\r
+ done\r
+ \r
++fi # gdb\r
++\r
+ test_done\r
+-- \r
+2.1.1\r
+\r