From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 67B5F6DE0FBD for ; Mon, 25 Sep 2017 13:39:01 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.065 X-Spam-Level: X-Spam-Status: No, score=-0.065 tagged_above=-999 required=5 tests=[AWL=0.146, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.211] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0_I9W1PAfWyH for ; Mon, 25 Sep 2017 13:39:00 -0700 (PDT) Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by arlo.cworth.org (Postfix) with ESMTPS id EF8ED6DE1034 for ; Mon, 25 Sep 2017 13:38:55 -0700 (PDT) Received: by mail-wr0-f182.google.com with SMTP id 108so9990774wra.5 for ; Mon, 25 Sep 2017 13:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=hzMtryHXHiMfIQwvIpVrUWjDrNvPrS2xAYTjfIsE0RU=; b=GPOxnn8LgWwmLQgeNZrilNUYCrKrxrukozl7zjExL3do3/3+jpVRQ+yAfx+nnvZOBH X6eBzIenezBYuYpkQUy1kc+4IvDv27HYBRCcR58wttHRWBnapKpwB4v8mksCdjHOT4Ka o6PFIM6XdAbaT91CKkajelV8Z9NL4flHWxUePvp/QDfsqs9tiwSA6JDEOk0UkYwnLIFC MixmjJDP+UMZCHqQZFShUoTVbIjEJrMczaIYOWDVs5bwjBnzOIGBsb9HLWockeIwB0y7 uEujVkPHXNYIN7FUkPrW6nGY4PCWJOEwfD0s8tdYWroIpQMoDkeYv8/ejQpBXlyEX+vt X18g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=hzMtryHXHiMfIQwvIpVrUWjDrNvPrS2xAYTjfIsE0RU=; b=k1OQlOGlyWImLOLyJThyvzCm3aycK3zDyiXzp2+FXT/eYoqkp9hTbWMXuysjuQkUzH qhX/nCFEJs1iyGrBp4LGYLJso5gs/urEhqWcScW836oBaa4ivYkzaDruzhCNPszRkjkF JpY404mKSdWpMIwZiyUIFqCY0IWz+CN4niXvHjidmkH75TSwqAFbDuskyBYd3r8V7H7g 2nrhYSgAus9qc7ZPwpcpsZJmo2yIFWjMz6uz2PoV18LygO6ALjc6ikdYoOtTxfxVG8Jg 17EPBAbEbRZm2d7+Tq6Aa/EOca29J2ffgDKVlwwqPJRqoNJyza6z+A8Ncg+/MLrR2xdh aT4g== X-Gm-Message-State: AHPjjUi+0NwiTFRZI4vs6PyqExGcCyERTg4xst7rnIHrw5tVcYe3ndaY HIN9SQ7c5oXHMOx42kU0YsrYiYwqzrY= X-Google-Smtp-Source: AOwi7QACMmhHN/Wl5bb4bbgrVArlc3A3fsEv22EYop6TVytsGa/tejXJFAY8eJANWbcWOZ5yy/e+ig== X-Received: by 10.46.91.76 with SMTP id p73mr3083175ljb.98.1506371933349; Mon, 25 Sep 2017 13:38:53 -0700 (PDT) Received: from localhost (mobile-access-5d6a60-234.dhcp.inet.fi. [93.106.96.234]) by smtp.gmail.com with ESMTPSA id b80sm1586955ljb.27.2017.09.25.13.38.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Sep 2017 13:38:52 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 05/24] test: check for notmuch binary in test-lib.sh Date: Mon, 25 Sep 2017 23:38:21 +0300 Message-Id: <85543ccb96ecfbc206d96e1a34d90009096b6c58.1506370901.git.jani@nikula.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Mon, 25 Sep 2017 20:39:01 -0000 Move notmuch executable check into common code. Redundant for notmuch-test runs, but works also for individual tests. --- test/T000-basic.sh | 10 ---------- test/test-lib.sh | 7 +++++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/test/T000-basic.sh b/test/T000-basic.sh index d514082d48e3..f3808c0753a2 100755 --- a/test/T000-basic.sh +++ b/test/T000-basic.sh @@ -4,16 +4,6 @@ # test_description='the test framework itself.' - -################################################################ -# It appears that people try to run tests without building... - -if ! test -x ../notmuch -then - echo >&2 'You do not seem to have built notmuch yet.' - exit 1 -fi - . $(dirname "$0")/test-lib.sh || exit 1 ################################################################ diff --git a/test/test-lib.sh b/test/test-lib.sh index 350246492d8c..e3b40f21743d 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -26,6 +26,13 @@ fi # Make sure echo builtin does not expand backslash-escape sequences by default. shopt -u xpg_echo +# It appears that people try to run tests without building... +if ! test -x ../notmuch +then + echo >&2 'You do not seem to have built notmuch yet.' + exit 1 +fi + this_test=${0##*/} this_test=${this_test%.sh} this_test_bare=${this_test#T[0-9][0-9][0-9]-} -- 2.11.0