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>
Jeff King committed
Jan 1, 2025 at 15:17 UTC
373a4326961c504ad6365fc1e4a9082e387499c7
1 file changed
+8
-13
t/test-lib.sh
+8
-13
@@ -340,17 +340,6 @@ case "$TRASH_DIRECTORY" in
340
*) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
341
esac
342
343
-# Utility functions using $TEST_RESULTS_* variables
344
-nr_san_dir_leaks_ () {
345
- # stderr piped to /dev/null because the directory may have
346
- # been "rmdir"'d already.
347
- find "$TEST_RESULTS_SAN_DIR" \
348
- -type f \
349
- -name "$TEST_RESULTS_SAN_FILE_PFX.*" 2>/dev/null |
350
- xargs grep -lv "Unable to get registers from thread" |
351
- wc -l
352
-}
353
-
343
# If --stress was passed, run this test repeatedly in several parallel loops.
344
if test "$GIT_TEST_STRESS_STARTED" = "done"
345
then
@@ -1181,8 +1170,14 @@ test_atexit_handler () {
1170
}
1171
1172
check_test_results_san_file_empty_ () {
1184
- test -z "$TEST_RESULTS_SAN_FILE" ||
1185
- test "$(nr_san_dir_leaks_)" = 0
1173
+ test -z "$TEST_RESULTS_SAN_FILE" && return 0
1174
+
1175
+ # stderr piped to /dev/null because the directory may have
1176
+ # been "rmdir"'d already.
1177
+ ! find "$TEST_RESULTS_SAN_DIR" \
1178
+ -type f \
1179
+ -name "$TEST_RESULTS_SAN_FILE_PFX.*" 2>/dev/null |
1180
+ xargs grep -qv "Unable to get registers from thread"
1181
}
1182
1183
check_test_results_san_file_ () {