Skip to content

Commit 047bd7d

Browse files
committed
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>
1 parent d797154 commit 047bd7d

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

ci/lib.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,9 @@ linux-musl-meson)
356356
;;
357357
linux-leaks|linux-reftable-leaks)
358358
export SANITIZE=leak
359+
export NO_CVS_TESTS=LetsSaveSomeTime
359360
export NO_SVN_TESTS=LetsSaveSomeTime
361+
export NO_P4_TESTS=LetsSaveSomeTime
360362
;;
361363
linux-asan-ubsan)
362364
export SANITIZE=address,undefined

t/lib-cvs.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
. ./test-lib.sh
44

5+
if test -n "$NO_CVS_TESTS"
6+
then
7+
skip_all='skipping git cvs tests, NO_CVS_TESTS defined'
8+
test_done
9+
fi
10+
511
unset CVS_SERVER
612

713
if ! type cvs >/dev/null 2>&1

t/lib-git-p4.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ P4D_TIMEOUT=300
1616

1717
. ./test-lib.sh
1818

19+
if test -n "$NO_P4_TESTS"
20+
then
21+
skip_all='skipping git p4 tests, NO_P4_TESTS defined'
22+
test_done
23+
fi
1924
if ! test_have_prereq PYTHON
2025
then
2126
skip_all='skipping git p4 tests; python not available'

0 commit comments

Comments
 (0)