5f/370eb2aadad90b87da4a5e359b823ec8b7968b

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 80F28431FBC\r
   6         for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 10:52:48 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id xsmcQ+3BHb17 for <notmuch@notmuchmail.org>;\r
  16         Tue, 28 Oct 2014 10:52:40 -0700 (PDT)\r
  17 Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com\r
  18  [74.125.82.42])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  5E76B431FB6    for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 10:52:39 -0700\r
  21  (PDT)\r
  22 Received: by mail-wg0-f42.google.com with SMTP id k14so76956wgh.15\r
  23         for <notmuch@notmuchmail.org>; Tue, 28 Oct 2014 10:52:37 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
  27         bh=YyL014oV7f6SI0XXQjXFJfMQe+1xKzUS7iiqr2Pd4j0=;\r
  28         b=b8pGe/K5R4KTvFZ1w01zhgwsKfRMcqW8f9oDJIFKLVOiRbEZXkbbEeKqD5ocdS6vG8\r
  29         8x8x3UlRlBhjcLWMWML4f+4dKIgrN1ZO53H7klStlN0my4vgOo+qVeANGT1u4+guU/2T\r
  30         3u4VbL0MajjvS8JAHaLpJt1RnbJpl8mieq5Ev0pAuFiHTF4n56Dbh9h+Sc9dPQOckSsR\r
  31         Lhnf+iXN/DSxlCf23JEUPcyx0nqU9Sa+50Vc60CW8+U9qzNuBWUQSSoks1vXCaZ1SxgV\r
  32         aoMJcYXWxd9XpG0txKHJguY8+cCM7JD/TcbyT4nYuTTl+EZ4nAyPfntedqaufhGshEzV\r
  33         sZew==\r
  34 X-Gm-Message-State:\r
  35  ALoCoQk0Egy9hygI6eAaLk/DKpvD3keeuX8AMFhJVyjWIrac+JyWBhd5BTqy3SABhP43FBTX3Y0U\r
  36 X-Received: by 10.180.104.198 with SMTP id gg6mr30440914wib.76.1414518756792; \r
  37         Tue, 28 Oct 2014 10:52:36 -0700 (PDT)\r
  38 Received: from localhost (dsl-hkibrasgw2-58c36d-48.dhcp.inet.fi.\r
  39         [88.195.109.48])\r
  40         by mx.google.com with ESMTPSA id k10sm2594942wjb.28.2014.10.28.10.52.35\r
  41         for <multiple recipients>\r
  42         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  43         Tue, 28 Oct 2014 10:52:36 -0700 (PDT)\r
  44 From: Jani Nikula <jani@nikula.org>\r
  45 To: notmuch@notmuchmail.org\r
  46 Subject: [PATCH] test: fix test_require_external_prereq gdb in insert test\r
  47 Date: Tue, 28 Oct 2014 19:52:34 +0200\r
  48 Message-Id: <1414518754-16344-1-git-send-email-jani@nikula.org>\r
  49 X-Mailer: git-send-email 2.1.1\r
  50 X-BeenThere: notmuch@notmuchmail.org\r
  51 X-Mailman-Version: 2.1.13\r
  52 Precedence: list\r
  53 List-Id: "Use and development of the notmuch mail system."\r
  54         <notmuch.notmuchmail.org>\r
  55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  58 List-Post: <mailto:notmuch@notmuchmail.org>\r
  59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  62 X-List-Received-Date: Tue, 28 Oct 2014 17:52:49 -0000\r
  63 \r
  64 You need to actually check the return value. Limit the missing deps\r
  65 part to subtests requiring gdb.\r
  66 ---\r
  67  test/T070-insert.sh | 6 ++++--\r
  68  1 file changed, 4 insertions(+), 2 deletions(-)\r
  69 \r
  70 diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
  71 index 168345c9897b..b21609833228 100755\r
  72 --- a/test/T070-insert.sh\r
  73 +++ b/test/T070-insert.sh\r
  74 @@ -2,8 +2,6 @@\r
  75  test_description='"notmuch insert"'\r
  76  . ./test-lib.sh\r
  77  \r
  78 -test_require_external_prereq gdb\r
  79 -\r
  80  # Create directories and database before inserting.\r
  81  mkdir -p "$MAIL_DIR"/{cur,new,tmp}\r
  82  mkdir -p "$MAIL_DIR"/Drafts/{cur,new,tmp}\r
  83 @@ -185,6 +183,8 @@ test_expect_code 1 "Invalid tags set exit code" \\r
  84  \r
  85  notmuch config set new.tags $OLDCONFIG\r
  86  \r
  87 +if test_require_external_prereq gdb; then\r
  88 +\r
  89  # DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass.\r
  90  \r
  91  for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \\r
  92 @@ -211,4 +211,6 @@ gdb --batch-silent --return-child-result -x index-file-$code.gdb \\r
  93  test_expect_equal $? 0\r
  94  done\r
  95  \r
  96 +fi # gdb\r
  97 +\r
  98  test_done\r
  99 -- \r
 100 2.1.1\r
 101 \r