git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/7] test: turn USR_BIN_TIME into a lazy prerequisite

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 9, 2014, 23:22 UTC
Message-ID
<1402356175-7249-3-git-send-email-gitster@pobox.com>
In-Reply-To
<1402356175-7249-1-git-send-email-gitster@pobox.com>

Two test scripts (t3302 and t3419) had copy & paste code to set USR_BIN_TIME prerequisite. Use the test_lazy_prereq helper to define them in the common t/test-lib.sh.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t3302-notes-index-expensive.sh | 1 -
 t/t3419-rebase-patch-id.sh       | 1 -
 t/test-lib.sh                    | 4 ++++
 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index e35d781..dc706ab 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -9,7 +9,6 @@ test_description='Test commit notes index (expensive!)'
 
 test_set_prereq NOT_EXPENSIVE
 test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
-test -x /usr/bin/time && test_set_prereq USR_BIN_TIME
 
 create_repo () {
 	number_of_commits=$1
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index e70ac10..08e30b3 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -6,7 +6,6 @@ test_description='git rebase - test patch id computation'
 
 test_set_prereq NOT_EXPENSIVE
 test -n "$GIT_PATCHID_TIMING_TESTS" && test_set_prereq EXPENSIVE
-test -x /usr/bin/time && test_set_prereq USR_BIN_TIME
 
 count()
 {
diff --git a/t/test-lib.sh b/t/test-lib.sh
index d70d05e..884c57c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -859,6 +859,10 @@ test_lazy_prereq EXPENSIVE '
 	test -n "$GIT_TEST_LONG"
 '
 
+test_lazy_prereq USR_BIN_TIME '
+	test -x /usr/bin/time
+'
+
 # 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
-- 
2.0.0-435-g307a092
Previous: Junio C HamanoNext: Jeff King
Message 3 of 9 in “A few minor test-prereq updates”
  1. 0/7 A few minor test-prereq updatesJunio C Hamano, Jun 9, 2014
  2. 1/7 test: turn EXPENSIVE into a lazy prerequisiteJunio C Hamano, Jun 9, 2014
  3. 2/7 test: turn USR_BIN_TIME into a lazy prerequisiteJunio C Hamano, Jun 9, 2014
  4. Jeff KingJun 13, 2014
  5. 3/7 t3302: coding style updatesJunio C Hamano, Jun 9, 2014
  6. 4/7 t3302: do not chdir around in the primary test processJunio C Hamano, Jun 9, 2014
  7. 5/7 t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisiteJunio C Hamano, Jun 9, 2014
  8. 6/7 t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisiteJunio C Hamano, Jun 9, 2014
  9. 7/7 tests: drop GIT_*_TIMING_TESTS environment variable supportJunio C Hamano, Jun 9, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.