test-lib: simplify leak-log checking

We have a function to count the number of leaks found (actually, it is
the number of processes which produced a log file). Once upon a time we
cared about seeing if this number increased between runs. But we
simplified that away in 95c679ad86 (test-lib: stop showing old leak
logs, 2024-09-24), and now we only care if it returns any results or
not.

In preparation for refactoring it further, let's drop the counting
function entirely, and roll it into the "is it empty" check. The outcome
should be the same, but we'll be free to return a boolean "did we find
anything" without worrying about somebody adding a new call to the
counting function.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/test-lib.sh b/t/test-lib.sh
index dd2ba6e6cc4c91230d84b856f1ee437a5c1a9cc9..23eb26bfbe9c1b2bf14e3e66e042bace5b189163 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -340,17 +340,6 @@ case "$TRASH_DIRECTORY" in
  *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
 esac
 
-# Utility functions using $TEST_RESULTS_* variables
-nr_san_dir_leaks_ () {
-       # stderr piped to /dev/null because the directory may have
-       # been "rmdir"'d already.
-       find "$TEST_RESULTS_SAN_DIR" \
-               -type f \
-               -name "$TEST_RESULTS_SAN_FILE_PFX.*" 2>/dev/null |
-       xargs grep -lv "Unable to get registers from thread" |
-       wc -l
-}
-
 # If --stress was passed, run this test repeatedly in several parallel loops.
 if test "$GIT_TEST_STRESS_STARTED" = "done"
 then
@@ -1181,8 +1170,14 @@ test_atexit_handler () {
 }
 
 check_test_results_san_file_empty_ () {
-       test -z "$TEST_RESULTS_SAN_FILE" ||
-       test "$(nr_san_dir_leaks_)" = 0
+       test -z "$TEST_RESULTS_SAN_FILE" && return 0
+
+       # stderr piped to /dev/null because the directory may have
+       # been "rmdir"'d already.
+       ! find "$TEST_RESULTS_SAN_DIR" \
+               -type f \
+               -name "$TEST_RESULTS_SAN_FILE_PFX.*" 2>/dev/null |
+       xargs grep -qv "Unable to get registers from thread"
 }
 
 check_test_results_san_file_ () {