35/31531ad158f19021cb0d711fbe88023cc0ddf0

   1 Return-Path: <jrollins@servo.finestructure.net>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 97A2A429E2F\r
   6         for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:27 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -1.921\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
  12         tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\r
  13         autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id Lmk1A8FcPUmS for <notmuch@notmuchmail.org>;\r
  17         Sat, 28 May 2011 14:52:26 -0700 (PDT)\r
  18 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
  19         [131.215.239.19])\r
  20         by olra.theworths.org (Postfix) with ESMTP id 27F82431FD0\r
  21         for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:16 -0700 (PDT)\r
  22 Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
  23         by earth-doxen-postvirus (Postfix) with ESMTP id A8AEF66E02C5;\r
  24         Sat, 28 May 2011 14:52:14 -0700 (PDT)\r
  25 X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
  26 Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com\r
  27         [98.149.172.122]) (Authenticated sender: jrollins)\r
  28         by earth-doxen-submit (Postfix) with ESMTP id DE23466E0343;\r
  29         Sat, 28 May 2011 14:52:11 -0700 (PDT)\r
  30 Received: by servo.finestructure.net (Postfix, from userid 1000)\r
  31         id 5A2B491D; Sat, 28 May 2011 14:52:05 -0700 (PDT)\r
  32 From: Jameson Graef Rollins <jrollins@finestructure.net>\r
  33 To: Notmuch Mail <notmuch@notmuchmail.org>\r
  34 Subject: [PATCH 22/25] test: fix test_expect_equal_file test to copy instead\r
  35         of mv test files\r
  36 Date: Sat, 28 May 2011 14:51:57 -0700\r
  37 Message-Id: <1306619520-25730-23-git-send-email-jrollins@finestructure.net>\r
  38 X-Mailer: git-send-email 1.7.4.4\r
  39 In-Reply-To: <1306619520-25730-22-git-send-email-jrollins@finestructure.net>\r
  40 References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net>\r
  41         <1306619520-25730-2-git-send-email-jrollins@finestructure.net>\r
  42         <1306619520-25730-3-git-send-email-jrollins@finestructure.net>\r
  43         <1306619520-25730-4-git-send-email-jrollins@finestructure.net>\r
  44         <1306619520-25730-5-git-send-email-jrollins@finestructure.net>\r
  45         <1306619520-25730-6-git-send-email-jrollins@finestructure.net>\r
  46         <1306619520-25730-7-git-send-email-jrollins@finestructure.net>\r
  47         <1306619520-25730-8-git-send-email-jrollins@finestructure.net>\r
  48         <1306619520-25730-9-git-send-email-jrollins@finestructure.net>\r
  49         <1306619520-25730-10-git-send-email-jrollins@finestructure.net>\r
  50         <1306619520-25730-11-git-send-email-jrollins@finestructure.net>\r
  51         <1306619520-25730-12-git-send-email-jrollins@finestructure.net>\r
  52         <1306619520-25730-13-git-send-email-jrollins@finestructure.net>\r
  53         <1306619520-25730-14-git-send-email-jrollins@finestructure.net>\r
  54         <1306619520-25730-15-git-send-email-jrollins@finestructure.net>\r
  55         <1306619520-25730-16-git-send-email-jrollins@finestructure.net>\r
  56         <1306619520-25730-17-git-send-email-jrollins@finestructure.net>\r
  57         <1306619520-25730-18-git-send-email-jrollins@finestructure.net>\r
  58         <1306619520-25730-19-git-send-email-jrollins@finestructure.net>\r
  59         <1306619520-25730-20-git-send-email-jrollins@finestructure.net>\r
  60         <1306619520-25730-21-git-send-email-jrollins@finestructure.net>\r
  61         <1306619520-25730-22-git-send-email-jrollins@finestructure.net>\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Sat, 28 May 2011 21:52:28 -0000\r
  75 \r
  76 This is a pretty important fix to this test, so that it can be used to\r
  77 test against existing files, without deleting them in the case of test\r
  78 failure.\r
  79 ---\r
  80  test/test-lib.sh |    4 ++--\r
  81  1 files changed, 2 insertions(+), 2 deletions(-)\r
  82 \r
  83 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  84 index 6a8cb98..a59d1c1 100755\r
  85 --- a/test/test-lib.sh\r
  86 +++ b/test/test-lib.sh\r
  87 @@ -477,8 +477,8 @@ test_expect_equal_file ()\r
  88                         test_ok_ "$test_subtest_name"\r
  89                 else\r
  90                         testname=$this_test.$test_count\r
  91 -                       mv "$output" $testname.output\r
  92 -                       mv "$expected" $testname.expected\r
  93 +                       cp "$output" $testname.output\r
  94 +                       cp "$expected" $testname.expected\r
  95                         test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)"\r
  96                 fi\r
  97      fi\r
  98 -- \r
  99 1.7.4.4\r
 100 \r