git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>, git@vger.kernel.org
Subject: [PATCH] t7400: fix bogus test failure with symlinked trash
Date: Fri, 29 Jul 2011 18:36:09 -0600	[thread overview]
Message-ID: <20110730003609.GA6089@sigill.intra.peff.net> (raw)

One of the tests in t7400 fails if the trash directory has a
symlink anywhere in its path. E.g.:

  $ mkdir /tmp/git-test
  $ mkdir /tmp/git-test/real
  $ ln -s real /tmp/git-test/link

  $ ./t7400-submodule-basic --root=/tmp/git-test/real
  ...
  # passed all 44 test(s)

  $ ./t7400-submodule-basic --root=/tmp/git-test/link
  ...
  not ok - 41 use superproject as upstream when path is relative and no url is set there

The failing test does:

  git submodule add ../repo relative &&
  ...
  git submodule sync relative &&
  test "$(git config submodule.relative.url)" = "$submodurl/repo"

where $submodurl comes from the $TRASH_DIRECTORY the user
gave us. However, git will resolve symlinks when converting
the relative path into an absolute one, leading them to be
textually different (even though they point to the same
directory).

Fix this by asking git to canonicalize the name of the trash
directory for us.

Signed-off-by: Jeff King <peff@peff.net>
---
This feels a little funny, because we are probably using the same
"convert relative to absolute" code to generate our expected value, as
well as in the test itself. So any bug in that code is likely to be
masked. But this test isn't really about checking the absolute path
code, but rather making sure that it is invoked properly.

 t/t7400-submodule-basic.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 5afe6cc..12200ca 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -48,7 +48,7 @@ test_expect_success 'setup - repository to add submodules to' '
 
 # The 'submodule add' tests need some repository to add as a submodule.
 # The trash directory is a good one as any.
-submodurl=$TRASH_DIRECTORY
+submodurl=`git rev-parse --show-toplevel`
 
 listbranches() {
 	git for-each-ref --format='%(refname)' 'refs/heads/*'
-- 
1.7.5.4.31.ge4d5e

             reply	other threads:[~2011-07-30  0:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-30  0:36 Jeff King [this message]
2011-07-30 10:41 ` [PATCH] t7400: fix bogus test failure with symlinked trash Jens Lehmann
2011-07-30 15:05   ` Jeff King
2011-07-30 15:44     ` Jens Lehmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110730003609.GA6089@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).