git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Joachim Schmitz <jojo@schmitz-digital.de>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/4] test-lib: allow variable export from lazy prereq tests
Date: Tue, 16 Oct 2012 13:39:45 +0200	[thread overview]
Message-ID: <ca07c5a1cf836826fc0ee53daf3e7f3dfe111ece.1350387132.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <k5gq60$q8c$1@ger.gmane.org>
In-Reply-To: <cover.1350387132.git.git@drmicha.warpmail.net>

Currently, lazy prereq tests are run in a subshell which communicates
only the exit code to the outer world.

Run it as a subcommand so that variables can be exported to the test
environment.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
I don't think this has any adverse side effects, but I'm begging for
another set of eyeballs to have a look. (Test suite passes, of course.)

 t/test-lib-functions.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 8889ba5..e587902 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -246,13 +246,15 @@ test_lazy_prereq () {
 test_run_lazy_prereq_ () {
 	script='
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
+{
 	cd "$TRASH_DIRECTORY/prereq-test-dir" &&'"$2"'
-)'
+}'
 	say >&3 "checking prerequisite: $1"
 	say >&3 "$script"
+	orig_pwd="$(pwd)"
 	test_eval_ "$script"
 	eval_ret=$?
+	cd "$orig_pwd"
 	rm -rf "$TRASH_DIRECTORY/prereq-test-dir"
 	if test "$eval_ret" = 0; then
 		say >&3 "prerequisite $1 ok"
-- 
1.8.0.rc2.304.g9f3ac5c

  parent reply	other threads:[~2012-10-16 11:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-15 10:56 t3302-notes-index-expensive.sh and t3419-rebase-patch-id.sh need time in /usr/bin Joachim Schmitz
2012-10-16 11:39 ` [PATCH 0/4] Allow different time commands Michael J Gruber
2012-10-16 11:39   ` [PATCH 1/4] t3419-rebase-patch-id: heed USR_BIN_TIME prereq Michael J Gruber
2012-10-16 16:32     ` Junio C Hamano
2012-10-16 11:39   ` Michael J Gruber [this message]
2012-10-16 16:16     ` [PATCH 2/4] test-lib: allow variable export from lazy prereq tests Junio C Hamano
2012-10-16 11:39   ` [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq Michael J Gruber
2012-10-16 14:13     ` Joachim Schmitz
2012-10-16 15:06       ` Michael J Gruber
2012-10-16 15:11         ` Joachim Schmitz
2012-10-16 15:07       ` [RFC/PATCH 3/4v2] " Michael J Gruber
2012-10-16 16:28         ` Andreas Schwab
2012-10-16 18:28           ` Stefano Lattarini
2012-10-16 19:21         ` Johannes Sixt
2012-10-16 19:34           ` Junio C Hamano
2012-10-16 16:41     ` [RFC/PATCH 3/4] " Junio C Hamano
2012-10-16 11:39   ` [PATCH 4/4] t3302,t3419: use the " Michael J Gruber

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=ca07c5a1cf836826fc0ee53daf3e7f3dfe111ece.1350387132.git.git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jojo@schmitz-digital.de \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).