ci: skip CVS and P4 tests in leaks job, too

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ci/lib.sh b/ci/lib.sh
index a165c7f2683bf61016c032f99fe993938df7a707..3ecbf147db4fc1515c4b10c75c03d1e829b4ee21 100755 (executable)
--- 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 57b9b2db9b3f8244dfec5a6cf5b6dc6a6dcb1138..c8b44048883dab3782369e850759cf19cadb4119 100644 (file)
--- 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 2a5b8738ea37da950b65cd8a3357b9ebdb59363e..d22e9c684a495ae3f31b51de2ef29320cf7c049d 100644 (file)
--- 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'