Skip to content

Commit 1f047a6

Browse files
committed
Merge branch 'js/ci-leak-skip-svn'
Dscho observed that SVN tests are taking too much time in CI leak checking tasks, but most time is spent not in our code but in libsvn code (which happen to be written in Perl), whose leaks have little value to discover for us. Skip SVN, P4, and CVS tests in the leak checking tasks. * js/ci-leak-skip-svn: ci: skip CVS and P4 tests in leaks job, too ci(*-leaks): skip the git-svn tests to save time
2 parents 3d95282 + 047bd7d commit 1f047a6

3 files changed

Lines changed: 14 additions & 0 deletions

File tree

ci/lib.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,9 @@ linux-musl-meson)
356356
;;
357357
linux-leaks|linux-reftable-leaks)
358358
export SANITIZE=leak
359+
export NO_CVS_TESTS=LetsSaveSomeTime
360+
export NO_SVN_TESTS=LetsSaveSomeTime
361+
export NO_P4_TESTS=LetsSaveSomeTime
359362
;;
360363
linux-asan-ubsan)
361364
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)