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 A068F429E29 for ; Mon, 9 May 2011 20:30:57 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, 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 pYXiRKpHIvr0 for ; Mon, 9 May 2011 20:30:57 -0700 (PDT) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id EFA8E429E26 for ; Mon, 9 May 2011 20:30:56 -0700 (PDT) Received: by bwg12 with SMTP id 12so5033541bwg.26 for ; Mon, 09 May 2011 20:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=G9nlO57K8G6B0fBpBiFcPfjsACAPudI5jnCUY06vojs=; b=hNIbentIvnV1Snx2gf8LXKrY6kVXyQ1kQOHtX18ogEmfLawt7aJl01s4yz3bhr3co0 oHobjIFcWnSBHo7L/gbzkx/mwPc8tsUbs/EDh3DVmFXuQTIWy4smLDdsNRC+cojDT1jX CPILqex7JvP7azK7fGHLp3RXXDwfXEMhrCyak= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ruQR0p8drM6v9ikcyY9T0JmapMgzLwWwPHGH/RTsDzTrJYjp5iXsOXSsHUT32bi1bv RvR3mqGAwd5T+O3dx9MGrclcytd3fPIWJe9NtPaTBlP5PWrj2Hd2fStU8rir8CesSIPC i8F28REHs/gK4D6kxz1gaKHwVh81GMgnT4T5Q= Received: by 10.204.76.73 with SMTP id b9mr6508350bkk.211.1304998255294; Mon, 09 May 2011 20:30:55 -0700 (PDT) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id a28sm321519fak.1.2011.05.09.20.30.54 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 20:30:54 -0700 (PDT) From: Dmitry Kurochkin To: Notmuch Mail Subject: [PATCH 1/2] test: copy files in test_expect_equal_file instead of moving them Date: Tue, 10 May 2011 07:30:50 +0400 Message-Id: <1304998251-28700-2-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1304998251-28700-1-git-send-email-dmitry.kurochkin@gmail.com> References: <1304998251-28700-1-git-send-email-dmitry.kurochkin@gmail.com> 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: Tue, 10 May 2011 03:30:57 -0000 Before the change, test_expect_equal_file moved files it compared in case of failure. The patch changes it to copy the files instead. This allows testing non-temporary files which are stored in git. Note: the change should not result in new temporary files left after the tests. Test_expect_equal_file used to move files only on failure, so callers had to cleanup them anyway. --- test/test-lib.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index eaf5051..7cc43cd 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -477,8 +477,8 @@ test_expect_equal_file () test_ok_ "$test_subtest_name" else testname=$this_test.$test_count - mv "$output" $testname.output - mv "$expected" $testname.expected + cp "$output" $testname.output + cp "$expected" $testname.expected test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)" fi fi -- 1.7.5.1