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 9FA62431FC3 for ; Fri, 30 May 2014 00:43:15 -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 zjtfcbMfDk87 for ; Fri, 30 May 2014 00:43:11 -0700 (PDT) Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E50D1431FBD for ; Fri, 30 May 2014 00:43:10 -0700 (PDT) Received: by mail-wi0-f176.google.com with SMTP id n15so593036wiw.3 for ; Fri, 30 May 2014 00:43:09 -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:in-reply-to :references; bh=lp8K2qD2ZX6CKrreJE46A+y6mKpTB3npUr4hw8aVKTA=; b=CWfiS5+jM3T1l8h4ioFJ8+H9WD94GjBpMnR2p6s+968Q6TyHqJp20XVfJ6ddZTrwCV DZOboy45dig8lOj95W4XrzW5A2NrkQ/jz7APuOzMy29cFtoSnZdyE/69+ZlXgtO9qAnQ +xs3iD0coDqvcOiiAmpkTvMTr9KQBvHMqeCOJg9DG3bpG49xt4J+4NF2Le1etAGRHQfG Iy74GQunWEBQWfS+AaUkhz7sET0WTLCZtCivFDDkMD1aALS3I/E1fAO+I0v3vOp+uzB3 VwyH2LOIwJZzuf7OnjPO+rwPnI0phYh3BY46yzN/lJelKwQ6QmR02I0qnBoex6ZLWAft CTyg== X-Gm-Message-State: ALoCoQmTofDgxmBwM2qCCdNq8ExK5/gK3NKUsz97AvW3L9sYZ3ZbMCunUInsmsWachwevKPJ8oFk X-Received: by 10.180.74.203 with SMTP id w11mr3873223wiv.27.1401435789693; Fri, 30 May 2014 00:43:09 -0700 (PDT) Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. [88.195.111.91]) by mx.google.com with ESMTPSA id ch16sm7990218wjb.43.2014.05.30.00.43.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 May 2014 00:43:09 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 2/2] test: use sh.config for configuration Date: Fri, 30 May 2014 10:43:05 +0300 Message-Id: <1401435785-2894-2-git-send-email-jani@nikula.org> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1401435785-2894-1-git-send-email-jani@nikula.org> References: <1401435785-2894-1-git-send-email-jani@nikula.org> Cc: Tomi Ollila 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: Fri, 30 May 2014 07:43:15 -0000 --- test/.gitignore | 2 -- test/Makefile.local | 16 ---------------- test/T010-help-test.sh | 2 +- test/T020-compact.sh | 2 +- test/test-lib-common.sh | 4 ++++ 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/test/.gitignore b/test/.gitignore index 4081cee6da18..b3b706d85188 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,7 +1,5 @@ arg-test corpus.mail -have-compact -have-man hex-xcode parse-time random-corpus diff --git a/test/Makefile.local b/test/Makefile.local index d622eafee786..1c85b18adc41 100644 --- a/test/Makefile.local +++ b/test/Makefile.local @@ -35,25 +35,9 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME) $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o $(call quiet,CC) $^ -o $@ -$(dir)/have-compact: Makefile.config -ifeq ($(HAVE_XAPIAN_COMPACT),1) - ln -sf /bin/true $@ -else - ln -sf /bin/false $@ -endif - -$(dir)/have-man: Makefile.config -ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00) - ln -sf /bin/false $@ -else - ln -sf /bin/true $@ -endif - .PHONY: test check TEST_BINARIES=$(dir)/arg-test \ - $(dir)/have-compact \ - $(dir)/have-man \ $(dir)/hex-xcode \ $(dir)/random-corpus \ $(dir)/parse-time \ diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh index 77410bc54e66..f0ca4549dc8b 100755 --- a/test/T010-help-test.sh +++ b/test/T010-help-test.sh @@ -7,7 +7,7 @@ test_expect_success 'notmuch --help' 'notmuch --help' test_expect_success 'notmuch help' 'notmuch help' test_expect_success 'notmuch --version' 'notmuch --version' -if ${TEST_DIRECTORY}/have-man; then +if [ $_HAVE_MAN -eq 1 ]; then test_expect_success 'notmuch --help tag' 'notmuch --help tag' test_expect_success 'notmuch help tag' 'notmuch help tag' else diff --git a/test/T020-compact.sh b/test/T020-compact.sh index 77bb9632cb11..19d81c5fc77d 100755 --- a/test/T020-compact.sh +++ b/test/T020-compact.sh @@ -10,7 +10,7 @@ notmuch tag +tag1 \* notmuch tag +tag2 subject:Two notmuch tag -tag1 +tag3 subject:Three -if ! ${TEST_DIRECTORY}/have-compact; then +if [ $_HAVE_XAPIAN_COMPACT -eq 0 ]; then test_begin_subtest "Compact unsupported: error message" output=$(notmuch compact --quiet 2>&1) test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support. diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 892991e2bd03..4903038dd9ce 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -38,6 +38,10 @@ find_notmuch_path () # test/ subdirectory and are run in 'trash directory' subdirectory. TEST_DIRECTORY=$(pwd) notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"` + +# configure output +. $notmuch_path/sh.config + if test -n "$valgrind" then make_symlink () { -- 2.0.0.rc2