aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictoria Dye <vdye@github.com>2022-05-21 22:18:53 +0000
committerJunio C Hamano <gitster@pobox.com>2022-05-21 16:25:56 -0700
commit110e91150ddb8caa75be8e1ffb937047dbd2752f (patch)
tree6075c35575ef7edfd26138de923c4de9192b6228
parent448de909a7dc0e0cc80aff6eff84de56a4c8bbfc (diff)
downloadgit-110e91150ddb8caa75be8e1ffb937047dbd2752f.tar.xz
ci(github): avoid printing test case preamble twice
We want to mark up the test case preamble when presenting test output in Git's GitHub workflow. Let's suppress the non-marked-up version in that case. Any information it would contain is included in the marked-up variant already. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib-functions.sh2
-rw-r--r--t/test-lib-github-workflow-markup.sh2
2 files changed, 4 insertions, 0 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index af4831a54c..89a5e146b7 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -803,6 +803,7 @@ test_expect_failure () {
export test_prereq
if ! test_skip "$@"
then
+ test -n "$test_skip_test_preamble" ||
say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2" expecting_failure
then
@@ -823,6 +824,7 @@ test_expect_success () {
export test_prereq
if ! test_skip "$@"
then
+ test -n "$test_skip_test_preamble" ||
say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2"
then
diff --git a/t/test-lib-github-workflow-markup.sh b/t/test-lib-github-workflow-markup.sh
index 1ef0fd5ba8..9c5339c577 100644
--- a/t/test-lib-github-workflow-markup.sh
+++ b/t/test-lib-github-workflow-markup.sh
@@ -20,6 +20,8 @@
# workflows; these functions will then override (empty) functions
# that are are called at the appropriate times during the test runs.
+test_skip_test_preamble=t
+
start_test_output () {
test -n "$GIT_TEST_TEE_OUTPUT_FILE" ||
die "--github-workflow-markup requires --verbose-log"