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 4A8026DE1034 for ; Mon, 25 Sep 2017 13:39:28 -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.07 X-Spam-Level: X-Spam-Status: No, score=-0.07 tagged_above=-999 required=5 tests=[AWL=0.141, 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 ccepFjUD_Kkg for ; Mon, 25 Sep 2017 13:39:27 -0700 (PDT) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by arlo.cworth.org (Postfix) with ESMTPS id 403A66DE096A for ; Mon, 25 Sep 2017 13:39:08 -0700 (PDT) Received: by mail-wr0-f194.google.com with SMTP id n64so600252wrb.2 for ; Mon, 25 Sep 2017 13:39:08 -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=ed4XrOV9qmsBhFk+3WugN+hS5u4t7HAN9ZpsObWrg+E=; b=LjliQjNim9gVEgFkbZUtdiMB+StZuaPuOc1R1a+VpS20YyouP+tjKzF6xQJQhYKLnR m0mHSySa45bTQrdcG+qaTT02gA2zHHHHU4cp8ueClHftPsNGRDAXIJHDisvbx+mQ2pfA S/Ww+NmE78aQi3DS0mQHd6N00+57gLZVf3jVaD7jwOOSZ/EBt2JgM/EMwUNIa6L7JHhF IsDxNLUCGL3f75aF49EyRHHQDzfKexGCmN5kZNoTA+qP05qG9TYOtLvAzdZDIr4l82AG 8bm5K+k1ytbrrGskIRzD7LgdTed6y+kXg3QhGg39A0hzSgKgVmVCfDcQa6lMeEDpquPH CqQQ== 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=ed4XrOV9qmsBhFk+3WugN+hS5u4t7HAN9ZpsObWrg+E=; b=frsQwMh7JxQMzblN9aSS09QjWn4rhQHv8RAPuYk/jD/QpkRs14sJF1+rHD09oPr1f0 9EZvXN0acDjsyDzP4RT2dZQnjIMp9Lgw6nwh1xhFYjhU8jp/zxD2kiM+A9dVsQyZqMuV fzG4BD1LBuC/+uMwn2QCYEj/yVDueulPI4keMSngjnxKD7C75BfkLj8g4ZuPh99Mcqbk GJKvRGTGQYvGFEGCAFMgGxfLg8XuinqZIZUZF6hzZwOqhP+qUbl8dPUP6qKnQmpxsgM5 jFb99GChvUthN+3dEf2L43Qy0jn7E3QTPdWyzLIpdoVMc3KHh2e3KTp6CmNdZVM6s/05 3t7Q== X-Gm-Message-State: AHPjjUhY+aQnStrD0xz5NVcw37gB0s/+a70U6FNO/ym/4gVUqy6AF2PP Mhu95MgbPIIGre0N0P/jPxm+u5riOcA= X-Google-Smtp-Source: AOwi7QAlm9PS6bmDmZQC9EQknogyB6uF+I+Kc3+xaZ6mCVi/vaJJV0SoZhhLUXzMbmE/e6uEzAoxkw== X-Received: by 10.25.43.80 with SMTP id r77mr2576796lfr.130.1506371944954; Mon, 25 Sep 2017 13:39:04 -0700 (PDT) Received: from localhost (mobile-access-5d6a60-234.dhcp.inet.fi. [93.106.96.234]) by smtp.gmail.com with ESMTPSA id t20sm1574519ljb.91.2017.09.25.13.39.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Sep 2017 13:39:04 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 12/24] test: use source and build paths in T000-basic.sh Date: Mon, 25 Sep 2017 23:38:28 +0300 Message-Id: <9bac50865afc5ed5063f7d2e3ad5902125ae6da7.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:28 -0000 Make a distinction between source and build directories. --- test/T000-basic.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/T000-basic.sh b/test/T000-basic.sh index f3808c0753a2..7fbdcfa3036c 100755 --- a/test/T000-basic.sh +++ b/test/T000-basic.sh @@ -32,19 +32,19 @@ fi test_begin_subtest 'failure to clean up causes the test to fail' test_expect_code 2 'test_when_finished "(exit 2)"' -EXPECTED=$TEST_DIRECTORY/test.expected-output +EXPECTED=$NOTMUCH_SRCDIR/test/test.expected-output suppress_diff_date() { sed -e 's/\(.*\-\-\- test-verbose\.4\.\expected\).*/\1/' \ -e 's/\(.*\+\+\+ test-verbose\.4\.\output\).*/\1/' } test_begin_subtest "Ensure that test output is suppressed unless the test fails" -output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose 2>&1 | suppress_diff_date) +output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= $NOTMUCH_SRCDIR/test/test-verbose 2>&1 | suppress_diff_date) expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date) test_expect_equal "$output" "$expected" test_begin_subtest "Ensure that -v does not suppress test output" -output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose -v 2>&1 | suppress_diff_date) +output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= $NOTMUCH_SRCDIR/test/test-verbose -v 2>&1 | suppress_diff_date) expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date) # Do not include the results of test-verbose in totals rm $TEST_DIRECTORY/test-results/test-verbose -- 2.11.0