From: Jani Nikula Date: Tue, 28 Oct 2014 17:52:34 +0000 (+0200) Subject: [PATCH] test: fix test_require_external_prereq gdb in insert test X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7533aadc422d0c31098a00eb100e76641b1e3903;p=notmuch-archives.git [PATCH] test: fix test_require_external_prereq gdb in insert test --- diff --git a/5f/370eb2aadad90b87da4a5e359b823ec8b7968b b/5f/370eb2aadad90b87da4a5e359b823ec8b7968b new file mode 100644 index 000000000..52f328029 --- /dev/null +++ b/5f/370eb2aadad90b87da4a5e359b823ec8b7968b @@ -0,0 +1,101 @@ +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 80F28431FBC + for ; Tue, 28 Oct 2014 10:52:48 -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 xsmcQ+3BHb17 for ; + Tue, 28 Oct 2014 10:52:40 -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 + 5E76B431FB6 for ; Tue, 28 Oct 2014 10:52:39 -0700 + (PDT) +Received: by mail-wg0-f42.google.com with SMTP id k14so76956wgh.15 + for ; Tue, 28 Oct 2014 10:52:37 -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:cc:subject:date:message-id; + bh=YyL014oV7f6SI0XXQjXFJfMQe+1xKzUS7iiqr2Pd4j0=; + b=b8pGe/K5R4KTvFZ1w01zhgwsKfRMcqW8f9oDJIFKLVOiRbEZXkbbEeKqD5ocdS6vG8 + 8x8x3UlRlBhjcLWMWML4f+4dKIgrN1ZO53H7klStlN0my4vgOo+qVeANGT1u4+guU/2T + 3u4VbL0MajjvS8JAHaLpJt1RnbJpl8mieq5Ev0pAuFiHTF4n56Dbh9h+Sc9dPQOckSsR + Lhnf+iXN/DSxlCf23JEUPcyx0nqU9Sa+50Vc60CW8+U9qzNuBWUQSSoks1vXCaZ1SxgV + aoMJcYXWxd9XpG0txKHJguY8+cCM7JD/TcbyT4nYuTTl+EZ4nAyPfntedqaufhGshEzV + sZew== +X-Gm-Message-State: + ALoCoQk0Egy9hygI6eAaLk/DKpvD3keeuX8AMFhJVyjWIrac+JyWBhd5BTqy3SABhP43FBTX3Y0U +X-Received: by 10.180.104.198 with SMTP id gg6mr30440914wib.76.1414518756792; + Tue, 28 Oct 2014 10:52:36 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw2-58c36d-48.dhcp.inet.fi. + [88.195.109.48]) + by mx.google.com with ESMTPSA id k10sm2594942wjb.28.2014.10.28.10.52.35 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Tue, 28 Oct 2014 10:52:36 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH] test: fix test_require_external_prereq gdb in insert test +Date: Tue, 28 Oct 2014 19:52:34 +0200 +Message-Id: <1414518754-16344-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 2.1.1 +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: Tue, 28 Oct 2014 17:52:49 -0000 + +You need to actually check the return value. Limit the missing deps +part to subtests requiring gdb. +--- + test/T070-insert.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/test/T070-insert.sh b/test/T070-insert.sh +index 168345c9897b..b21609833228 100755 +--- a/test/T070-insert.sh ++++ b/test/T070-insert.sh +@@ -2,8 +2,6 @@ + test_description='"notmuch insert"' + . ./test-lib.sh + +-test_require_external_prereq gdb +- + # Create directories and database before inserting. + mkdir -p "$MAIL_DIR"/{cur,new,tmp} + mkdir -p "$MAIL_DIR"/Drafts/{cur,new,tmp} +@@ -185,6 +183,8 @@ test_expect_code 1 "Invalid tags set exit code" \ + + notmuch config set new.tags $OLDCONFIG + ++if test_require_external_prereq gdb; then ++ + # DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass. + + for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \ +@@ -211,4 +211,6 @@ gdb --batch-silent --return-child-result -x index-file-$code.gdb \ + test_expect_equal $? 0 + done + ++fi # gdb ++ + test_done +-- +2.1.1 +