1 file changed, 6 insertions, 2 deletions

diff --git a/tests/t0003-cache.sh b/tests/t0003-cache.shindex c0e9f1d..e2f4b8b 100755--- a/tests/t0003-cache.sh+++ b/tests/t0003-cache.sh@@ -619,10 +619,14 @@ test_expect_success PERL_RUNS 'a refresh finding the lock held serves the expire 	test_must_be_empty held.err ' +# Valgrind cannot start under ulimit -f 0, as it writes a file for its own+# gdbserver before cgit runs, so the tests that set that limit run without it.+test -n "$CGIT_VALGRIND" || test_set_prereq NO_VALGRIND+ # A lock file that cannot take the key goes with its lock, rather than # staying behind locked while the page renders uncached. The limit is on # files, so the log and cgit's exit status go through the pipe as well.-test_expect_success 'a slot lock that cannot take its key is let go' '+test_expect_success NO_VALGRIND 'a slot lock that cannot take its key is let go' ' 	rm -rf cache3 && mkdir cache3 && 	( 		trap "" XFSZ &&@@ -658,7 +662,7 @@ test_expect_success 'set up a cached scan of two repositories' ' # before the write failed, so each repository is listed once and nothing is # left in the cache-root. The limit is on files, so the log and the exit # status go through the pipe with the page.-test_expect_success 'a scan whose list cannot be written lists each repository once' '+test_expect_success NO_VALGRIND 'a scan whose list cannot be written lists each repository once' ' 	rm -rf cache9 && mkdir cache9 && 	sed "s|^cache-root=.*|cache-root=$PWD/cache9|" scanrc >unwritablerc && 	(
diff --git a/tests/t0003-cache.sh b/tests/t0003-cache.sh
index c0e9f1d..e2f4b8b 100755
--- a/tests/t0003-cache.sh
+++ b/tests/t0003-cache.sh
@@ -619,10 +619,14 @@ test_expect_success PERL_RUNS 'a refresh finding the lock held serves the expire
 	test_must_be_empty held.err
 '
 
+# Valgrind cannot start under ulimit -f 0, as it writes a file for its own
+# gdbserver before cgit runs, so the tests that set that limit run without it.
+test -n "$CGIT_VALGRIND" || test_set_prereq NO_VALGRIND
+
 # A lock file that cannot take the key goes with its lock, rather than
 # staying behind locked while the page renders uncached. The limit is on
 # files, so the log and cgit's exit status go through the pipe as well.
-test_expect_success 'a slot lock that cannot take its key is let go' '
+test_expect_success NO_VALGRIND 'a slot lock that cannot take its key is let go' '
 	rm -rf cache3 && mkdir cache3 &&
 	(
 		trap "" XFSZ &&
@@ -658,7 +662,7 @@ test_expect_success 'set up a cached scan of two repositories' '
 # before the write failed, so each repository is listed once and nothing is
 # left in the cache-root. The limit is on files, so the log and the exit
 # status go through the pipe with the page.
-test_expect_success 'a scan whose list cannot be written lists each repository once' '
+test_expect_success NO_VALGRIND 'a scan whose list cannot be written lists each repository once' '
 	rm -rf cache9 && mkdir cache9 &&
 	sed "s|^cache-root=.*|cache-root=$PWD/cache9|" scanrc >unwritablerc &&
 	(