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: [RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq
Date: Tue, 16 Oct 2012 17:07:01 +0200 [thread overview]
Message-ID: <28ca29e59c5905ba7232dcdbe4661f37ef90cac5.1350399860.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <007001cdaba8$5afc6c00$10f54400$@schmitz-digital.de>
Some test want to use the time command (not the shell builtin) and test
for its availability at /usr/bin/time.
Provide a lazy prereq TIME_COMMAND which tests for $TEST_COMMAND_PATH,
which can be set from config.mak. It defaults to /usr/bin/time.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Here's what the make variable version could look like.
1/4 and 4/4 would stay as is, 2/4 could be dropped.
t/Makefile | 5 +++--
t/test-lib.sh | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/t/Makefile b/t/Makefile
index 88e289f..52b4039 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -13,6 +13,7 @@ TAR ?= $(TAR)
RM ?= rm -f
PROVE ?= prove
DEFAULT_TEST_TARGET ?= test
+TIME_COMMAND_PATH ?= /usr/bin/time
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -27,11 +28,11 @@ test: pre-clean $(TEST_LINT)
$(MAKE) aggregate-results-and-cleanup
prove: pre-clean $(TEST_LINT)
- @echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+ @echo "*** prove ***"; GIT_CONFIG=.git/config TIME_COMMAND_PATH=$(TIME_COMMAND_PATH) $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
$(MAKE) clean-except-prove-cache
$(T):
- @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+ @echo "*** $@ ***"; GIT_CONFIG=.git/config TIME_COMMAND_PATH=$(TIME_COMMAND_PATH) '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
pre-clean:
$(RM) -r test-results
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 489bc80..173eb13 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -738,6 +738,10 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
esac
'
+test_lazy_prereq TIME_COMMAND '
+ test -x "$TIME_COMMAND_PATH"
+'
+
# When the tests are run as root, permission tests will report that
# things are writable when they shouldn't be.
test -w / || test_set_prereq SANITY
--
1.8.0.rc2.304.g9f3ac5c
next prev parent reply other threads:[~2012-10-16 15:07 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 ` [PATCH 2/4] test-lib: allow variable export from lazy prereq tests Michael J Gruber
2012-10-16 16:16 ` 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 ` Michael J Gruber [this message]
2012-10-16 16:28 ` [RFC/PATCH 3/4v2] " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=28ca29e59c5905ba7232dcdbe4661f37ef90cac5.1350399860.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.
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).