From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 5oygG6kEOGDKcgAA0tVLHw (envelope-from ) for ; Thu, 25 Feb 2021 20:12:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OLv1FqkEOGDMQQAAbx9fmQ (envelope-from ) for ; Thu, 25 Feb 2021 20:12:25 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DBE0E20590 for ; Thu, 25 Feb 2021 21:12:24 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 2134926A27; Thu, 25 Feb 2021 15:12:18 -0500 (EST) X-Greylist: delayed 454 seconds by postgrey-1.36 at nmbug; Thu, 25 Feb 2021 15:12:16 EST Received: from meesny.iki.fi (meesny.iki.fi [IPv6:2001:67c:2b0:1c1::201]) by mail.notmuchmail.org (Postfix) with ESMTPS id 314E11FD22 for ; Thu, 25 Feb 2021 15:12:15 -0500 (EST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by meesny.iki.fi (Postfix) with ESMTPSA id 7221F200EB; Thu, 25 Feb 2021 22:04:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1614283475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zoS+xwlDp5GAUjVxhk2jENDKdGlIwzIFfN7VJ3dnsFU=; b=GnAvRbeV/5tTANn2W1kXV+pwDQQpihtwWNQVMhpnGg4iRcA2YMvzyzvU59v8TpSkpEV7Iz C9cUQOQu6PKbAY8VwCGeu51e3NvOOl8oWtyNktqMCrfdn+Xfyu1Sn7qjgB+92/nzjO/Dgh +Gteu5vVkexh7SCFzt2o4++TJGsvVw0= From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH] test: T020-compact.sh: fix work directory location Date: Thu, 25 Feb 2021 22:04:30 +0200 Message-Id: <20210225200430.30918-1-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 ARC-Seal: i=1; s=meesny; d=iki.fi; t=1614283475; a=rsa-sha256; cv=none; b=fwenIbrv1haGHwt5a+NeXorLAIFfIueamkrH0TAgBA6vgp+xubv0CRE0K7L/+Us7nK8104 /rBOjyKUoQpMdLRkKwOaTcXaH/yjlb4otLqMGP7ZLwGe9Qy78L7jSjYsCKrRzbfXlC/3A/ wVfooc3dnHCbCeJ3yLvUINV7GLPIj1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1614283475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zoS+xwlDp5GAUjVxhk2jENDKdGlIwzIFfN7VJ3dnsFU=; b=sF6nELuO5RDoAbVJbnGctRLA54odnEH+GN8j22/hsXQU+cfgLla830BelJoT+k4FoERSNx ByjI4tsAuyAZQFoTf5MKhqtfpb2XCZICnjgaVlIFg+qCVC9LWPfG8mcOTtp5oAFb49H0A3 n5gBltouNy5j9Az+ety4t1V2MOUQ8mY= ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi Message-ID-Hash: A2B45QFVUIUMVEUPEHHGFAE624XMA4KR X-Message-ID-Hash: A2B45QFVUIUMVEUPEHHGFAE624XMA4KR X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: tomi.ollila@iki.fi X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=meesny header.b=GnAvRbeV; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: DBE0E20590 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: /HFPyPfE6/zW Fix use of $TEST_DIRECTORY ($NOTMUCH_BUILDDIR/test/) with use of $TMP_DIRECTORY ($NOTMUCH_BUILDDIR/test/tmp.T020-compact/ in case of T020-compact.sh) as root directory where to write test files and directories. --- test/T020-compact.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/T020-compact.sh b/test/T020-compact.sh index 02f8738f..d77db00d 100755 --- a/test/T020-compact.sh +++ b/test/T020-compact.sh @@ -11,7 +11,7 @@ notmuch tag +tag2 subject:Two notmuch tag -tag1 +tag3 subject:Three test_begin_subtest "Running compact" -test_expect_success "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old" +test_expect_success "notmuch compact --backup=${TMP_DIRECTORY}/xapian.old" test_begin_subtest "Compact preserves database" output=$(notmuch search \* | notmuch_search_sanitize) @@ -22,7 +22,7 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" test_begin_subtest "Restoring Backup" test_expect_success 'rm -Rf ${MAIL_DIR}/.notmuch/xapian && - mv ${TEST_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian' + mv ${TMP_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian' test_begin_subtest "Checking restored backup" output=$(notmuch search \* | notmuch_search_sanitize) -- 2.29.2