git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: John Keeping <john@keeping.me.uk>, Thomas Rast <tr@thomasrast.ch>
Subject: [PATCH 1/3] t0000: set TEST_OUTPUT_DIRECTORY for sub-tests
Date: Sat, 28 Dec 2013 04:29:15 -0500	[thread overview]
Message-ID: <20131228092915.GA21109@sigill.intra.peff.net> (raw)
In-Reply-To: <20131228092731.GA26337@sigill.intra.peff.net>

Once upon a time, the test-lib library would create trash
directories in the current working directory, unless we were
explicitly told to put it elsewhere via --root. As a result,
t0000 created the sub-test trash directories inside its own
trash directory.

However, we noticed that this did not cover all cases, since
we would need to respect $TEST_OUTPUT_DIRECTORY even if
--root is not given (or is relative). Commit 38b074d fixed
this to consistently use the full path.

As a result, t0000's sub-tests are now created in git's
original test output directory rather than in our trash
directory. Furthermore, since some of the sub-tests simulate
failures, the trash directories do not get cleaned up, and
the cruft is left in the t/ directory.

We could fix this by passing a new "--root=$TRASH_DIRECTORY"
option to the sub-test. However, we do not want the sub-tests
to write anything at all to git's directory (e.g., they
should not be writing to t/test-results, either, although
this is already handled by separate code).  So the best
solution is to simply reset $TEST_OUTPUT_DIRECTORY entirely
in the sub-test, which covers this case, as well as any
future ones.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t0000-basic.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 10be52b..bc4e3e2 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -71,6 +71,8 @@ run_sub_test_lib_test () {
 		cat >>"$name.sh" &&
 		chmod +x "$name.sh" &&
 		export TEST_DIRECTORY &&
+		TEST_OUTPUT_DIRECTORY=$(pwd) &&
+		export TEST_OUTPUT_DIRECTORY &&
 		./"$name.sh" "$@" >out 2>err
 	)
 }
-- 
1.8.5.1.399.g900e7cd

  reply	other threads:[~2013-12-28  9:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-28  9:27 [PATCH 0/3] t0000 cleanups Jeff King
2013-12-28  9:29 ` Jeff King [this message]
2013-12-28 22:13   ` [PATCH 1/3] t0000: set TEST_OUTPUT_DIRECTORY for sub-tests Jonathan Nieder
2013-12-28 22:20     ` Jonathan Nieder
2013-12-29  7:17     ` Jeff King
2013-12-28  9:31 ` [PATCH 2/3] t0000: simplify HARNESS_ACTIVE hack Jeff King
2013-12-28 22:14   ` Jonathan Nieder
2013-12-28  9:33 ` [PATCH 3/3] t0000: drop "known breakage" test Jeff King
2013-12-28 20:51   ` Jonathan Nieder
2013-12-29  7:22     ` Jeff King
2013-12-28 22:21 ` [PATCH 0/3] t0000 cleanups Jonathan Nieder
2013-12-30 18:30   ` Junio C Hamano
2013-12-30 18:51     ` Jonathan Nieder
2013-12-30 19:24       ` Junio C Hamano
2013-12-31 10:33       ` Jeff King
2014-01-02 22:28         ` Jonathan Nieder
2014-01-02 22:41           ` Junio C Hamano
2014-01-03  1:04           ` Jeff King

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=20131228092915.GA21109@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=john@keeping.me.uk \
    --cc=tr@thomasrast.ch \
    /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).