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 08DE06DE0FE6 for ; Mon, 25 Sep 2017 13:39:03 -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.307 X-Spam-Level: X-Spam-Status: No, score=0.307 tagged_above=-999 required=5 tests=[AWL=-0.226, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.211, URIBL_SBL=0.644, URIBL_SBL_A=0.1] 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 mlV5JXtkEIjQ for ; Mon, 25 Sep 2017 13:39:01 -0700 (PDT) Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by arlo.cworth.org (Postfix) with ESMTPS id CFF766DE111A for ; Mon, 25 Sep 2017 13:38:59 -0700 (PDT) Received: by mail-wr0-f181.google.com with SMTP id l22so10053726wrc.10 for ; Mon, 25 Sep 2017 13:38:59 -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=AMBfw/legMdGMXFbwzn38T0rxnSqvbto1ClSdoRn2CE=; b=MLJNITFRkmLpt4ctXjZHTHEfOqfIwbw/Zi2rRatjLuzTp5kT5CCvs2VN3i78rIGoFR gOhgdQICmDbnvufy8zEyWhvkQRmJ2GbrKOY3AUV4cN1/OMsXg+bBEXKXiU821/1Nw+z9 MtfFUdK6KuCosKVsuMhqVuLQ9TIcauM/bJgVHc2TluoDjSkOs4EByp87i8YNw9BP91/3 paaszjBGz+rpyi1kJedbcASKtc/NQN0vRUQs5tPa2z2qK2WVDuWfj0mVdzjHLN+m6n0m QB6zVNpdE2AelT61aCCs7Jxcz3uybGTHDyGvi9lBFAVWXePacyolPfUGhsOG3H4BgXoa qZ8g== 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=AMBfw/legMdGMXFbwzn38T0rxnSqvbto1ClSdoRn2CE=; b=FB9N+3nOut0JwgHDWwEk+sZYVsitWK2sG3qH4llNBLilVH5COL81nW6Q7urW4YqyiR IJkKtf+xYlxF3ZwA5NBKxTsdFgNqCw3H+wtJnJV1Qinje/OaKI/lc5lsI/uxtcI+Yb3D 452Cl0FVPB0ONnnI13GYwiMaYetg9gzs7Yg4dXleNzW5Dswko8mSyIi5q1OiP5rT75Fd m0yT6GW1aGsgeRsPB7AOqLE020RHY3c1UK7VIntQKMPbVLaq8hXb+lXm9/iJKzCnfbkd STDRMgWmWL/Jntv34M+Auwgirth2DwNV0dQmyU3SVEwf/iEq1IU9dnH4ezx/0Ik3ub12 NMzQ== X-Gm-Message-State: AHPjjUhhbjNUHUARpmQWZllGVWXVcgnvlWjuUmrlH0maiZZAUc5Nt/7z H7C6BgyLI9Av3nh2bofHncKspw4hWe8= X-Google-Smtp-Source: AOwi7QDbErZ6n/HKfxyOgRTojZos1v/eI5HwqQDfLweMoNJRpyogKwTt/fmRlqGcNwhpUtlFdIDntA== X-Received: by 10.46.82.20 with SMTP id g20mr3160086ljb.150.1506371938279; Mon, 25 Sep 2017 13:38:58 -0700 (PDT) Received: from localhost (mobile-access-5d6a60-234.dhcp.inet.fi. [93.106.96.234]) by smtp.gmail.com with ESMTPSA id g132sm1111649lfe.13.2017.09.25.13.38.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Sep 2017 13:38:57 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 08/24] perf-test: use source and build paths in perf-test-lib.sh Date: Mon, 25 Sep 2017 23:38:24 +0300 Message-Id: <6f74dcb0cd518bbca628fd5443e19a483628c79a.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:03 -0000 Make a distinction between source and build directories. --- performance-test/perf-test-lib.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh index c89d5aab39a0..56538abddcdb 100644 --- a/performance-test/perf-test-lib.sh +++ b/performance-test/perf-test-lib.sh @@ -1,4 +1,4 @@ -. ./version.sh || exit 1 +. $(dirname "$0")/version.sh || exit 1 corpus_size=large @@ -25,12 +25,16 @@ do echo "error: unknown performance test option '$1'" >&2; exit 1 ;; esac done -. ../test/test-lib-common.sh || exit 1 + +# Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set. +. $(dirname "$0")/../test/export-dirs.sh || exit 1 + +. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1 set -e -if ! test -x ../notmuch -then +# It appears that people try to run tests without building... +if [[ ! -x "$NOTMUCH_BUILDDIR/notmuch" ]]; then echo >&2 'You do not seem to have built notmuch yet.' exit 1 fi -- 2.11.0