summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-01-17 10:34:17 -0800
committerJunio C Hamano <gitster@pobox.com>2026-01-19 11:02:31 -0800
commit047bd7dfe3b6563ea5f6543533207e3481f3e74c (patch)
tree2a84bb28d51ce4a71b5c886d25b9942cb06985e3
parentd7971544fe17378f44f49983010dbfc1834f7bef (diff)
downloadgit-047bd7dfe3b6563ea5f6543533207e3481f3e74c.tar.xz
ci: skip CVS and P4 tests in leaks job, too
Looking at the CI logs, the p4 and cvs tests account for another 24 minutes of test time and they offer minimal value for quite a similar reason as the previous step. Let's introduce and use a mechanism to skip these tests to save some resources. Suggested-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xci/lib.sh2
-rw-r--r--t/lib-cvs.sh6
-rw-r--r--t/lib-git-p4.sh5
3 files changed, 13 insertions, 0 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index a165c7f268..3ecbf147db 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -356,7 +356,9 @@ linux-musl-meson)
;;
linux-leaks|linux-reftable-leaks)
export SANITIZE=leak
+ export NO_CVS_TESTS=LetsSaveSomeTime
export NO_SVN_TESTS=LetsSaveSomeTime
+ export NO_P4_TESTS=LetsSaveSomeTime
;;
linux-asan-ubsan)
export SANITIZE=address,undefined
diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index 57b9b2db9b..c8b4404888 100644
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -2,6 +2,12 @@
. ./test-lib.sh
+if test -n "$NO_CVS_TESTS"
+then
+ skip_all='skipping git cvs tests, NO_CVS_TESTS defined'
+ test_done
+fi
+
unset CVS_SERVER
if ! type cvs >/dev/null 2>&1
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 2a5b8738ea..d22e9c684a 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -16,6 +16,11 @@ P4D_TIMEOUT=300
. ./test-lib.sh
+if test -n "$NO_P4_TESTS"
+then
+ skip_all='skipping git p4 tests, NO_P4_TESTS defined'
+ test_done
+fi
if ! test_have_prereq PYTHON
then
skip_all='skipping git p4 tests; python not available'