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 EFC09429E25 for ; Thu, 1 Dec 2011 14:03:17 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, 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 0cU+md8juaL0 for ; Thu, 1 Dec 2011 14:03:17 -0800 (PST) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 59CDA431FD0 for ; Thu, 1 Dec 2011 14:03:17 -0800 (PST) Received: by bkbzu5 with SMTP id zu5so1596665bkb.26 for ; Thu, 01 Dec 2011 14:03:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer; bh=xhAG7VWTlN5W/tnmDKBb2vDlgAZsmXeVs7k1/miStpA=; b=gLZVwIRzidOrPCTIMFKnFeD+uPt9CfpvhJS03DUQcRvZidHnTFnuLCMQuiLWx85vJ7 v46e0ewWW3luvGz1eKE2caaCGUXuOZHmnlOtXhDNPEnf3hL81dZ3j1bXD0cn12ofTIRR xnufg0ZWMplP0a7jL3x3XSxPNtcu1kzFOFJxQ= Received: by 10.204.132.78 with SMTP id a14mr9701860bkt.15.1322776994497; Thu, 01 Dec 2011 14:03:14 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id h7sm14363882bkw.12.2011.12.01.14.03.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Dec 2011 14:03:13 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH] test: cleanup gdb external dependency in atomicity tests Date: Fri, 2 Dec 2011 02:02:46 +0400 Message-Id: <1322776967-27631-1-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.3 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: Thu, 01 Dec 2011 22:03:18 -0000 Change atomicity tests to use the new external binary dependencies. This simplifies the code and makes output consistent. --- test/atomicity | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/atomicity b/test/atomicity index ad7d4a3..6df0a00 100755 --- a/test/atomicity +++ b/test/atomicity @@ -7,8 +7,7 @@ test_description='atomicity' # final database contents should be the same regardless of when (or # if) it is killed and restarted. -if which gdb 1>/dev/null 2>&1; then - test_set_prereq GDB +if test_require_external_prereq gdb; then # Create a maildir structure to also stress flag synchronization mkdir $MAIL_DIR/cur @@ -91,14 +90,11 @@ if which gdb 1>/dev/null 2>&1; then i=$(expr $end - 1) fi done -else - say_color info "%-6s" "WARNING" - echo " Missing test prerequisite GDB" -fi +fi test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts' -test_expect_equal_file GDB searchall expectall +test_expect_equal_file searchall expectall -test_expect_success GDB "detected $outcount>10 abort points" "test $outcount -gt 10" +test_expect_success "detected $outcount>10 abort points" "test $outcount -gt 10" test_done -- 1.7.7.3