c7/8b6ae8f6f39f41f1f84cebd857235caa9c37aa

   1 Return-Path: <ethan.glasser.camp@gmail.com>\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 0C86F431FAF\r
   6         for <notmuch@notmuchmail.org>; Fri, 12 Oct 2012 13:43:39 -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: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 LzvIBJcfPLQ8 for <notmuch@notmuchmail.org>;\r
  17         Fri, 12 Oct 2012 13:43:38 -0700 (PDT)\r
  18 Received: from mail-qa0-f46.google.com (mail-qa0-f46.google.com\r
  19         [209.85.216.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 5252F431FAE\r
  22         for <notmuch@notmuchmail.org>; Fri, 12 Oct 2012 13:43:38 -0700 (PDT)\r
  23 Received: by mail-qa0-f46.google.com with SMTP id c26so53503qad.5\r
  24         for <notmuch@notmuchmail.org>; Fri, 12 Oct 2012 13:43:37 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  26         h=from:to:cc:subject:date:message-id:x-mailer;\r
  27         bh=9e2Z5Dj6IbNPPgSC6psBtWDqNCSA4Jc4xBAtLZ8pjPQ=;\r
  28         b=kqmsFcKo/eDJdqRy8hyTs6VfTLrrcg2KaEBjrtYHfS2WNvNd1hyKdXa90MY3gFdLLV\r
  29         ZNdt9aUefyXcpnxNu9DHvUpsnc7ujRtbPVctXY+cx29UW+pToBx3uBLMTicTP1clROTT\r
  30         REfvDPaOA/RtbXQEGhlN/8azfUnsFLsKHA0pbiZNHahdrEIkcZB27hLBxvwzBz24YIKw\r
  31         t3VB9JD0yLIR1qOPcykn4MzY6YaYGNro2sF1Br9nNBUotLK2bBA5ixYPFe+21NJWGwFh\r
  32         0PkvfoxKw97Dvd40CUMPP2xVBn/jBpHNsTKcyHkiXVfMVBaaOGmjc1iRIqHJYhNojoMT\r
  33         UpTA==\r
  34 Received: by 10.224.192.70 with SMTP id dp6mr9211201qab.87.1350074617792;\r
  35         Fri, 12 Oct 2012 13:43:37 -0700 (PDT)\r
  36 Received: from smtp.gmail.com (p70-80.acedsl.com. [66.114.70.80])\r
  37         by mx.google.com with ESMTPS id jt10sm7268825qeb.4.2012.10.12.13.43.35\r
  38         (version=TLSv1/SSLv3 cipher=OTHER);\r
  39         Fri, 12 Oct 2012 13:43:36 -0700 (PDT)\r
  40 From: Ethan Glasser-Camp <ethan.glasser.camp@gmail.com>\r
  41 To: notmuch@notmuchmail.org\r
  42 Subject: [PATCH] test: handle filenames that have directories in them\r
  43 Date: Fri, 12 Oct 2012 16:43:28 -0400\r
  44 Message-Id: <1350074609-21769-1-git-send-email-ethan@betacantrips.com>\r
  45 X-Mailer: git-send-email 1.7.9.5\r
  46 Cc: Ethan Glasser-Camp <ethan@betacantrips.com>\r
  47 X-BeenThere: notmuch@notmuchmail.org\r
  48 X-Mailman-Version: 2.1.13\r
  49 Precedence: list\r
  50 List-Id: "Use and development of the notmuch mail system."\r
  51         <notmuch.notmuchmail.org>\r
  52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  53         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  55 List-Post: <mailto:notmuch@notmuchmail.org>\r
  56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  58         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  59 X-List-Received-Date: Fri, 12 Oct 2012 20:43:39 -0000\r
  60 \r
  61 Since $TEST_DIRECTORY is an absolute path, any filenames generated\r
  62 with it will be complete paths. Only use the basename to generate\r
  63 suffixes for filenames.\r
  64 \r
  65 Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>\r
  66 ---\r
  67 Discovered this while reviewing the patch queue. test/emacs generates\r
  68 filenames using $TEST_DIRECTORY, which is generated using pwd(1). Test\r
  69 failures then cause failures in the test harness.\r
  70 \r
  71  test/test-lib.sh |    8 +++++---\r
  72  1 file changed, 5 insertions(+), 3 deletions(-)\r
  73 \r
  74 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  75 index 7448b45..8de5e32 100644\r
  76 --- a/test/test-lib.sh\r
  77 +++ b/test/test-lib.sh\r
  78 @@ -498,16 +498,18 @@ test_expect_equal_file ()\r
  79         error "bug in the test script: not 2 or 3 parameters to test_expect_equal"\r
  80  \r
  81         file1="$1"\r
  82 +       basename1=`basename "$file1"`\r
  83         file2="$2"\r
  84 +       basename2=`basename "$file2"`\r
  85         if ! test_skip "$test_subtest_name"\r
  86         then\r
  87                 if diff -q "$file1" "$file2" >/dev/null ; then\r
  88                         test_ok_ "$test_subtest_name"\r
  89                 else\r
  90                         testname=$this_test.$test_count\r
  91 -                       cp "$file1" "$testname.$file1"\r
  92 -                       cp "$file2" "$testname.$file2"\r
  93 -                       test_failure_ "$test_subtest_name" "$(diff -u "$testname.$file1" "$testname.$file2")"\r
  94 +                       cp "$file1" "$testname.$basename1"\r
  95 +                       cp "$file2" "$testname.$basename2"\r
  96 +                       test_failure_ "$test_subtest_name" "$(diff -u "$testname.$basename1" "$testname.$basename2")"\r
  97                 fi\r
  98      fi\r
  99  }\r
 100 -- \r
 101 1.7.9.5\r
 102 \r