Re: [PATCH] test: handle filenames that have directories in them

diff --git a/b4/e882943e8e6f9819be25b63d4737fb53b304f9 b/b4/e882943e8e6f9819be25b63d4737fb53b304f9
new file mode 100644 (file)
index 0000000..1f17751
--- /dev/null
+++ b/b4/e882943e8e6f9819be25b63d4737fb53b304f9
@@ -0,0 +1,113 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 189AA431FBF\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Oct 2012 22:43:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id V3Vwm8skSfTX for <notmuch@notmuchmail.org>;\r
+       Wed, 17 Oct 2012 22:43:20 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 518D9431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Oct 2012 22:43:20 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id D3F941000E5;\r
+       Thu, 18 Oct 2012 08:43:21 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Ethan Glasser-Camp <ethan.glasser.camp@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: handle filenames that have directories in them\r
+In-Reply-To: <1350074609-21769-1-git-send-email-ethan@betacantrips.com>\r
+References: <1350074609-21769-1-git-send-email-ethan@betacantrips.com>\r
+User-Agent: Notmuch/0.14+51~g62cd13b (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Thu, 18 Oct 2012 08:43:21 +0300\r
+Message-ID: <m2bog01gjq.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: Ethan Glasser-Camp <ethan@betacantrips.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 18 Oct 2012 05:43:25 -0000\r
+\r
+On Fri, Oct 12 2012, Ethan Glasser-Camp <ethan.glasser.camp@gmail.com> wrote:\r
+\r
+> Since $TEST_DIRECTORY is an absolute path, any filenames generated\r
+> with it will be complete paths. Only use the basename to generate\r
+> suffixes for filenames.\r
+>\r
+> Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>\r
+> ---\r
+> Discovered this while reviewing the patch queue. test/emacs generates\r
+> filenames using $TEST_DIRECTORY, which is generated using pwd(1). Test\r
+> failures then cause failures in the test harness.\r
+\r
+\r
+LGTM. \r
+\r
+Removing needs-review (for this trivial change) as this helps the\r
+good review work Ethan is doing :D\r
+\r
+Tomi\r
+\r
+Ps: some shell "trivia ;)" basename=`basename "$file"` works for variable\r
+assignment; when giving as argument to command that needs one more quotes:\r
+e.g. wc "`basename "$file"`"\r
+fun?!\r
+\r
+>\r
+>  test/test-lib.sh |    8 +++++---\r
+>  1 file changed, 5 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> index 7448b45..8de5e32 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -498,16 +498,18 @@ test_expect_equal_file ()\r
+>      error "bug in the test script: not 2 or 3 parameters to test_expect_equal"\r
+>  \r
+>      file1="$1"\r
+> +    basename1=`basename "$file1"`\r
+>      file2="$2"\r
+> +    basename2=`basename "$file2"`\r
+>      if ! test_skip "$test_subtest_name"\r
+>      then\r
+>              if diff -q "$file1" "$file2" >/dev/null ; then\r
+>                      test_ok_ "$test_subtest_name"\r
+>              else\r
+>                      testname=$this_test.$test_count\r
+> -                    cp "$file1" "$testname.$file1"\r
+> -                    cp "$file2" "$testname.$file2"\r
+> -                    test_failure_ "$test_subtest_name" "$(diff -u "$testname.$file1" "$testname.$file2")"\r
+> +                    cp "$file1" "$testname.$basename1"\r
+> +                    cp "$file2" "$testname.$basename2"\r
+> +                    test_failure_ "$test_subtest_name" "$(diff -u "$testname.$basename1" "$testname.$basename2")"\r
+>              fi\r
+>      fi\r
+>  }\r
+> -- \r
+> 1.7.9.5\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r