From: Fabian Stelzer <fs@gigacodes.de>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Adam Dinwoodie" <adam@dinwoodie.org>,
"Jeff King" <peff@peff.net>, "Fabian Stelzer" <fs@gigacodes.de>
Subject: [PATCH v4 2/3] test-lib: introduce required prereq for test runs
Date: Wed, 1 Dec 2021 09:53:14 +0100 [thread overview]
Message-ID: <20211201085315.576865-3-fs@gigacodes.de> (raw)
In-Reply-To: <20211201085315.576865-1-fs@gigacodes.de>
In certain environments or for specific test scenarios we might expect a
specific prerequisite check to succeed. Therefore we would like to abort
running our tests if this is not the case.
To remedy this we add the environment variable GIT_TEST_REQUIRE_PREREQ
which can be set to a space separated list of prereqs. If one of these
prereq tests fail then the whole test run will abort.
Signed-off-by: Fabian Stelzer <fs@gigacodes.de>
---
t/README | 6 ++++++
t/test-lib-functions.sh | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/t/README b/t/README
index 29f72354bf..2353a4c5e1 100644
--- a/t/README
+++ b/t/README
@@ -466,6 +466,12 @@ explicitly providing repositories when accessing submodule objects is
complete or needs to be abandoned for whatever reason (in which case the
migrated codepaths still retain their performance benefits).
+GIT_TEST_REQUIRE_PREREQ=<list> allows specifying a space speparated list of
+prereqs that are required to succeed. If a prereq in this list is triggered by
+a test and then fails then the whole test run will abort. This can help to make
+sure the expected tests are executed and not silently skipped when their
+dependency breaks or is simply not present in a new environment.
+
Naming Tests
------------
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index eef2262a36..389153e591 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -680,6 +680,17 @@ test_have_prereq () {
# Keep a list of missing prerequisites; restore
# the negative marker if necessary.
prerequisite=${negative_prereq:+!}$prerequisite
+
+ # Abort if this prereq was marked as required
+ if test -n "$GIT_TEST_REQUIRE_PREREQ"
+ then
+ case " $GIT_TEST_REQUIRE_PREREQ " in
+ *" $prerequisite "*)
+ BAIL_OUT "required prereq $prerequisite failed"
+ ;;
+ esac
+ fi
+
if test -z "$missing_prereq"
then
missing_prereq=$prerequisite
--
2.31.1
next prev parent reply other threads:[~2021-12-01 8:53 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 9:04 [PATCH v2 0/2] test-lib: improve missing prereq handling Fabian Stelzer
2021-11-17 9:04 ` [PATCH v2 1/2] test-lib: show missing prereq summary Fabian Stelzer
2021-11-17 9:04 ` [PATCH v2 2/2] test-lib: introduce required prereq for test runs Fabian Stelzer
2021-11-18 23:42 ` Junio C Hamano
2021-11-19 9:07 ` Fabian Stelzer
2021-11-19 11:13 ` Ævar Arnfjörð Bjarmason
2021-11-19 13:48 ` Fabian Stelzer
2021-11-19 14:09 ` Fabian Stelzer
2021-11-19 14:26 ` Ævar Arnfjörð Bjarmason
2021-11-19 15:40 ` Fabian Stelzer
2021-11-19 16:37 ` Ævar Arnfjörð Bjarmason
2021-11-20 15:03 ` [PATCH v3 0/3] test-lib: improve missing prereq handling Fabian Stelzer
2021-11-20 15:03 ` [PATCH v3 1/3] test-lib: show missing prereq summary Fabian Stelzer
2021-11-20 15:04 ` [PATCH v3 2/3] test-lib: introduce required prereq for test runs Fabian Stelzer
2021-11-20 15:04 ` [PATCH v3 3/3] test-lib: make BAIL_OUT() work in tests and prereq Fabian Stelzer
2021-11-22 11:52 ` Ævar Arnfjörð Bjarmason
2021-11-22 17:05 ` Junio C Hamano
2021-11-26 9:55 ` Fabian Stelzer
2021-11-26 21:02 ` Junio C Hamano
2021-11-27 12:47 ` Fabian Stelzer
2021-11-28 23:38 ` Junio C Hamano
2021-11-30 14:38 ` Fabian Stelzer
2021-11-30 14:59 ` Ævar Arnfjörð Bjarmason
2021-12-01 8:53 ` [PATCH v4 0/3] test-lib: improve missing prereq handling Fabian Stelzer
2021-12-01 8:53 ` [PATCH v4 1/3] test-lib: show missing prereq summary Fabian Stelzer
2021-12-01 8:53 ` Fabian Stelzer [this message]
2021-12-01 8:53 ` [PATCH v4 3/3] test-lib: make BAIL_OUT() work in tests and prereq Fabian Stelzer
2021-12-01 23:13 ` Junio C Hamano
2021-12-01 21:05 ` [PATCH v4 0/3] test-lib: improve missing prereq handling Adam Dinwoodie
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=20211201085315.576865-3-fs@gigacodes.de \
--to=fs@gigacodes.de \
--cc=adam@dinwoodie.org \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).